added lobby
adding models and lobby
resolving merge conflicts