update is working
solve merge
Merge branch 'master' of https://github.com/IvanMalison/HackathonPortal