Merge branch 'master' of https://github.com/ProgramTheHacks/YHack14

Conflicts:
	app.js
	views/index.jade
Merge branch 'master' of https://github.com/ProgramTheHacks/YHack14
Merge branch 'master' of https://github.com/ProgramTheHacks/YHack14