Lots of errors
please work
Merge branch 'Cameron' of https://github.com/tchordia/teamdhc2 into Cameron

Conflicts:
	BottleRocketFX/bin/.gitignore
	BottleRocketFX/bin/htmlPack/RocketE.css
	BottleRocketFX/bin/mathPack/Barrowman.class
	BottleRocketFX/src/mathPack/Barrowman.java
Merge branch 'Cameron' of https://github.com/tchordia/teamdhc2 into Cameron
This commit is so I can push
Merge branch 'Cameron' of https://github.com/tchordia/teamdhc2 into Cameron

Conflicts:
	BottleRocketFX/bin/src/GUIpack/ProjectileBall$10.class
	BottleRocketFX/bin/src/GUIpack/ProjectileBall$11.class
	BottleRocketFX/bin/src/GUIpack/ProjectileBall$12.class
	BottleRocketFX/bin/src/GUIpack/ProjectileBall$3.class
	BottleRocketFX/bin/src/GUIpack/ProjectileBall$4.class
	BottleRocketFX/bin/src/GUIpack/ProjectileBall$5.class
	BottleRocketFX/bin/src/GUIpack/ProjectileBall$6.class
	BottleRocketFX/bin/src/GUIpack/ProjectileBall$7.class
	BottleRocketFX/bin/src/GUIpack/ProjectileBall$8.class
	BottleRocketFX/bin/src/GUIpack/ProjectileBall$9.class
	BottleRocketFX/bin/src/GUIpack/ProjectileBall.class
	BottleRocketFX/bin/src/GUIpack/RMenu.class
	BottleRocketFX/bin/src/GUIpack/RocketF$CPanel.class
	BottleRocketFX/bin/src/GUIpack/RocketF$HTMLFile$1.class
	BottleRocketFX/bin/src/GUIpack/RocketF$HTMLFile.class
	BottleRocketFX/bin/src/GUIpack/RocketF$MenuP.class
	BottleRocketFX/bin/src/GUIpack/RocketF$WPanel.class
	BottleRocketFX/bin/src/GUIpack/RocketF.class
	BottleRocketFX/src/src/GUIpack/ProjectileBall.java
	BottleRocketFX/src/src/GUIpack/RMenu.java
	BottleRocketFX/src/src/GUIpack/RocketF.java