Fixed merge errors and replaced the level with Michael's new version.
Merge branch 'master' of https://github.com/mrunderhill89/CMPS179-ByGloveAndDagger

Conflicts:
	bin/CMPS179ByGloveAndDagger.swf
	levels/level1.swf