Almost done
Merge branch 'master' of https://github.com/sahilshekhawat/Funzoned

Conflicts:
	hackathon/templates/index.html