Working on LobbyActivity
Merged conflicts
Merge branch 'master' of https://github.com/clayreimann/CloudDrawing

Conflicts:
	res/values/strings.xml