changed
changed
Merge branch 'master' of https://github.com/PhoenixRockit/monster

Conflicts:
	gameplay.php
ok
Merge branch 'master' of https://github.com/PhoenixRockit/monster
changes to player object
Merge branch 'master' of https://github.com/PhoenixRockit/monster