Merge branch 'master' of github.com:3vilguy/Gamecraft

Conflicts:
	bin-debug/GameCraft.swf
Merge branch 'master' of github.com:3vilguy/Gamecraft