greyscale weapon bugfix
Merge branch 'master' of https://github.com/tongue/FiveOnIt

Conflicts:
	public/javascripts/app/game.js
	views/client.jade