Merge branch 'Tanmay'
move the rocketF into constructor
Merge branch 'Cameron' into Tanmay

Conflicts:
	RocketProjectTest/bin/src/GUIpack/RocketF$SPanel.class
	RocketProjectTest/bin/src/GUIpack/RocketF.class
Increase encapsulation