Updated About
Merge branch 'master' of https://github.com/felixzhuologist/hackMIT14

Conflicts:
	css/custom.css
	index.html
	js/input.js
	js/main.js