commit before pull
Merge branch 'master' of https://github.com/mrunderhill89/CMPS179-ByGloveAndDagger

Conflicts:
	bin/CMPS179ByGloveAndDagger.swf
	obj/CMPS179-ByGloveAndDaggerConfig.xml
commit before pull
commit before pull
quick fla i made, still needs code
Merge branch 'master' of https://github.com/mrunderhill89/CMPS179-ByGloveAndDagger

Conflicts:
	bin/CMPS179ByGloveAndDagger.swf
	obj/CMPS179-ByGloveAndDaggerConfig.old
	obj/CMPS179-ByGloveAndDaggerConfig.xml