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

Conflicts:
	controllers/gameController.js