Merge pull request #63 from Vermilingua/fallbackjquery

Cleaned up the scars from the merge, and added the working fallback

index.html

@@ -16,11 +16,15 @@
 	<link rel="shortcut icon" href="favicon.ico" />
 	<link rel="image_src" href="img/adr.png" />
 	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
-	<!-- <script src="lib/jquery.min.js"></script> -->
+	<script>
+		if(!window.jQuery) {
+			document.write('<script src="lib/jquery.min.js"><\/script>')
+		}
+	</script>
 	<script src="lib/jquery.color-2.1.2.min.js"></script>
 	<script src="lib/jquery.event.move.js"></script>
 	<script src="lib/jquery.event.swipe.js"></script>
-  <script src="lib/base64.js"></script>
+	<script src="lib/base64.js"></script>
 	<script src="script/Button.js"></script>
 	<script src="script/engine.js"></script>
 	<script src="script/state_manager.js"></script>

list.TODO

@@ -1,5 +0,0 @@
- ☐ fix the NaN issue at the space screen
- ☐ persuade michael to get everyone onboard with a big update
- ☐ school (never gonna happen)
- ☐ about page
- ✔ drool over sublime text @done (13-10-31 22:33)