Spinning health kits and shit
Merge branch 'master' of github.com:rhanak/merwar

Conflicts:
	charmanager.py