Fix #411
Merge branch 'master' of github.com:FreezingMoon/AncientBeast

Conflicts:
	combat/js/creature.js