Stupid commit
Merge branch 'master' of github.com:AtkinsSJ/dodger

Conflicts:
	bin/1Dodger.swf
	obj/1DodgerConfig.xml