old
merged files
Merge branch 'master' of https://github.com/g-palmer/hashtags
Merge branch 'master' of https://github.com/g-palmer/hashtags
gitMerge branch 'master' of https://github.com/g-palmer/hashtags
emptying html when new game starts
changed auht to local
Merge branch 'master' of https://github.com/g-palmer/hashtags
new game modal working
clicking new game correctly routes to new game screen
set up game view boilerplate
cleaned up lobby to game routing
reverted to 2 commits ago
Merge branch 'master' of https://github.com/g-palmer/hashtags
added all users route
Merge branch 'master' of https://github.com/g-palmer/hashtags
new game routes to create game view
Merge branch 'master' of https://github.com/g-palmer/hashtags
create game template wip
Merge branch 'master' of https://github.com/g-palmer/hashtags into lobbyView-GP

Conflicts:
	public/index.html
	public/javascripts/app/hashtags.js