WIP
Adding user to competition is broken
Merge branch 'master' of https://github.com/guymorita/elevator
Merge branch 'shao'