Cleaned up login
Lobby and routing updated
Merge branch 'master' of github.com:ShmyQ/term-project