warrior mood changes
Merge branch 'master' of https://github.com/Avnerus/ggj2

Conflicts:
	dude.js
	tribe.js
some merge fixex