huntin for zombies, theyre still out there
Merge branch 'master' of https://github.com/g-palmer/hashtags into zombies

Conflicts:
	public/javascripts/app/views/gameView.js
couple small style changes