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

Conflicts:
	src/JoJoJoGame.as
1