Baddies
Merge branch 'master' of https://github.com/mmzhao/Platforming-Game

Conflicts:
	Baddie.java