added lobby functionality and changed player to include server players
fixed the merge conflicts
we should really learn how to branch