Fixing all these things
Merge branch 'master' of https://github.com/Bro-Pals/TAG_Jam_16_2

Conflicts:
	src/bropals/tag16_2/projectile/Projectile.java
Merge branch 'master' of https://github.com/Bro-Pals/TAG_Jam_16_2