I hear shit
Merge branch 'master' of https://github.com/derekwu/hackMIT_2014

Conflicts:
	main.js