wip.
Merge branch 'master' of https://github.com/IvanMalison/HackathonPortal

Conflicts:
	hackathon_portal/templates/hackathon.html
Merge remote-tracking branch 'origin/master'
Made the hackathon.html template work.