dumb merge commit
Merge branch 'project2' of https://github.com/gmdearaujo/project1.git into project2
Added new activities for initial game lobby as well as waiting stage