I have to do this to pull
Merge branch 'Cameron' of https://github.com/tchordia/teamdhc2 into Cameron

Conflicts:
	BottleRocketFX/bin/src/GUIpack/CreateRocket.class
Merge branch 'Cameron' of https://github.com/tchordia/teamdhc2 into Cameron

Conflicts:
	BottleRocketFX/bin/.gitignore
	BottleRocketFX/bin/src/GUIpack/CreateRocket.class
	BottleRocketFX/bin/src/GUIpack/RocketSliders.class

please work