sup
took out weird files
twerkin on adding sockets n shit to waiting view
Merge branch 'master' of https://github.com/g-palmer/hashtags
refactored server-side socket code for greater modularity
players is a hash
word
Merge branch 'master' of https://github.com/g-palmer/hashtags

Conflicts:
	controllers/gameController.js
refactor to make players a hash instead of array
game header template twerkin with _.each
added username and avatarURL to judge in game model
judge object
rendering subview of image select async with patch
Merge branch 'master' of https://github.com/g-palmer/hashtags
handling player requests
Merge branch 'master' of https://github.com/g-palmer/hashtags

Conflicts:
	controllers/gameController.js
	public/javascripts/app/views/gameView.js
hard at twerk
added res.end and res.writehead into callback of save
figured out the mongoose bullshit
Merge branch 'master' of https://github.com/g-palmer/hashtags

Conflicts:
	controllers/gameController.js