Moar shit
Merge branch 'master' of github.com:fayeli/WildHacks2k14

Conflicts:
	views/index.hbs