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

Conflicts:
	Player.java
Merge branch 'master' of https://github.com/mmzhao/Platforming-Game

Conflicts:
	Baddie.java
	Player.java