asdf
Merge branch 'master' of https://github.com/Joaly/b2w

Conflicts:
	src/characters/Player.as
Merge branch 'master' of https://github.com/Joaly/b2w
Fix.