Merge branch 'master' into development

Conflicts: index.html
InfiniteSkills · Feb 26, 2014 · d8e44d4 · d8e44d4
2 parents 3ee8bc6 + 4b2a2ba
commit d8e44d4
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/index.html b/index.html
@@ -23,8 +23,7 @@ <h1>Git Training Topics</h1>
       <div class="subtopic">Adding New Files</div>
       <div class="subtopic">Modifying Existing Files</div>
       <div class="subtopic">Committing Files to a Repository</div>
-
-
+
 
     <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
     <script src="https://code.jquery.com/jquery.js"></script>