sup
Merge branch 'master' of https://github.com/g-palmer/hashtags
Merge branch 'master' of https://github.com/g-palmer/hashtags
Merge branch 'master' of https://github.com/g-palmer/hashtags
Merge branch 'master' of https://github.com/g-palmer/hashtags
Merge branch 'master' of https://github.com/g-palmer/hashtags
Merge branch 'master' of https://github.com/g-palmer/hashtags
Merge branch 'master' of https://github.com/g-palmer/hashtags
reverted to 2 commits ago
Merge branch 'master' of https://github.com/g-palmer/hashtags
Merge branch 'master' of https://github.com/g-palmer/hashtags
Merge branch 'master' of https://github.com/g-palmer/hashtags
Merge branch 'master' of https://github.com/banjolina-jolie/hashtags
game view rendering with id for da hoes
lobby view shows list of games
judge has h1 and others have divs
judge is blue in gameview
Merge branch 'master' of https://github.com/g-palmer/hashtags

Conflicts:
	app.js
	controllers/gameController.js
Merge branch 'master' of https://github.com/g-palmer/hashtags