merging HEAD with current branch

Snowyace · Dec 22, 2013 · 0a55adf · 0a55adf
2 parents 5060fdb + 1f74076
commit 0a55adf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,4 @@ logs
 results
 
 npm-debug.log
-*~
+*~
diff --git a/static/index.html b/static/index.html
@@ -23,6 +23,7 @@ <h3>Lectures</h3>
 		<li>Input</li>
 		<li>Social software</li>
 		<li>Ubiquitous computing</li>
+		<li>Design tools</li>
 	</ol>
 </body>
 </html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,4 +12,4 @@ logs @@
     results
     npm-debug.log
-    *~
+    *~