changed weapons to match proper use color
Merge branch 'master' of https://github.com/brdunfield/GGJ2014

Conflicts:
	character.js