media submit goes to waiting view
Merge branch 'master' of https://github.com/g-palmer/hashtags into sockets-GP
gameWaiting feature added
client event socket io
Merge branch 'master' of https://github.com/g-palmer/hashtags
player emits join event when joins in progress game, server responds and player joins room with socket
removed orig
sending invitation notices through sockets
added invitation buttons
fixed game id lobby bug
took out whitespace
Merge branch 'master' of https://github.com/g-palmer/hashtags

Conflicts:
	models/userModel.js
took out whitespace
took out some shit
take out a debugger and whitespace
whitespace and debugger... gone
whitespace and debugger... gone
entering and leaving rooms
players leave room when they navigate back to lobby
merged