Add lobby
Merge remote-tracking branch 'upstream/master'
Merge pull request #11 from william-alexander/master

Add lobby
More work on gameplay
Added login server and user authentication
Merge pull request #12 from elaksana/master

Added login server and user authentication
resolve merge conflicts
Merge branch 'master' of github.com:csci201/final-project
Merging Ben's changes with the repo.
Ben's stuff
useless commit.
reverted bad changes
Login system works.
Merge pull request #13 from elaksana/master

Login System now works.
Added sql DB, login and registration client/server up and ready!
Merge pull request #14 from elaksana/master

Added sql DB, login and registration client/server up and ready!
Merge remote-tracking branch 'upstream/master'