Enhanced uses of player class
Merge branch 'master' of github.com:wilbefast/bear-hug-beware-game

Conflicts:
	src/game.lua