css, markup, scroll to top
Merge branch 'master' of https://github.com/decapyre/AngelHack-app

Conflicts:
	web/public/main.js