hell yea
I know
Merge branch 'Cameron' of https://github.com/tchordia/teamdhc2 into
Cameron

Conflicts:
	BottleRocketFX/bin/src/GUIpack/RocketMath.class
	BottleRocketFX/src/src/GUIpack/RocketF.java
	BottleRocketFX/src/src/GUIpack/RocketMath.java
	RocketProject2/src/src/GUIpack/ProjectileBall.java