ya
Merge branch 'master' of https://github.com/g-palmer/hashtags

Conflicts:
	public/javascripts/app/views/lobbyView.js