fix merge conflict
Merge branch 'master' of https://github.com/IvanMalison/HackathonPortal
Merge branch 'master' of https://github.com/IvanMalison/HackathonPortal
edit edit_project