add project is working
merge conflict
Merge branch 'master' of https://github.com/IvanMalison/HackathonPortal

Conflicts:
	hackathon_portal/routes.py