Mainpage added
Merge branch 'master' of github.com:schfkt/hackathon.submit

Conflicts:
	Gemfile
	Gemfile.lock