made new tmx then changed to xml
Merge branch 'master' of https://github.com/jamesmichiemo/NJ_Squared

Conflicts:
	bin-debug/Main.swf
Merge branch 'master' of https://github.com/jamesmichiemo/NJ_Squared

Conflicts:
	bin-debug/Main.swf
	src/com/NJSquared/gameCore/Assets.as
fixing merge conflict….