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
removing pending games successfully