sending res for user and socket for other users
updated style
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
little things
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
priest/rabbi prompt
Merge branch 'master' of https://github.com/g-palmer/hashtags
changed backend so declined property is either true or false instead of a string
threequals 4 rather than mod
extra route for invite
invite
Merge branch 'master' of https://github.com/g-palmer/hashtags
some stuff
Merge branch 'master' of https://github.com/g-palmer/hashtags into bugfix

Conflicts:
	instaOauth/authenticate.js
	public/javascripts/app/templates/lobbyPendingGamesTemplate.js
	public/javascripts/app/views/lobbyPendingGamesView.js