Shells
Merge branch 'master' of https://github.com/mmzhao/Platforming-Game
"Michael is a fucking retard" and I hope your internship people see this.
Conflicts:
	GamePanel.java
	Projectile.java
	Weapon.java