testing rebase

Conflicts:

	org/flixel/FlxG.as