Working on routes.
Merge branch 'master' of github.com:IvanMalison/HackathonPortal

* 'master' of github.com:IvanMalison/HackathonPortal:
  added edit project
  set up project.html

Conflicts:
	hackathon_portal/routes.py