chillin in 402
Merge branch 'master' of https://github.com/sahil-ansari/boar-square

Conflicts:
	boar-square/index.html
did some crappy stuff that should be deleted
Merge branch 'master' of https://github.com/sahil-ansari/boar-square

Conflicts:
	boar-square/js/main.js
Merge branch 'master' of https://github.com/sahil-ansari/boar-square
Merge branch 'master' of https://github.com/sahil-ansari/boar-square
nothin
Merge branch 'master' of https://github.com/sahil-ansari/boar-square

Conflicts:
	boar-square/index.html
	boar-square/js/io.js
Merge branch 'master' of https://github.com/sahil-ansari/boar-square
Merge branch 'master' of https://github.com/sahil-ansari/boar-square

Conflicts:
	boar-square/index.html
footer pops up