sdrgklsdtropsrmq
Merge branch 'master' of https://github.com/Aveys/CabestanGame.git

Conflicts:
	src/Cabestan.as
	src/org/cabestan/BoatState.as
	src/org/cabestan/BoutiqueState.as
	src/org/flixel/FlxG.as