continuing to work on switching game satates
fix conflicts

Conflicts:
	bin-debug/Main.swf