Fix routing issue
Merge branch 'master' of github.com:GovHackers/InEvent