Fixed some errors

Fixed some errors in the code. Nothing too important.
Merge branch 'master' of https://github.com/buddyboy3121/sidescrollerfps

Conflicts:
	src/org/item/ItemGunWeapon.java