animation stuff
Merge branch 'master' of github.com:PVince81/pp45hb

Conflicts:
	player.lua