rename
Merge branch 'Cameron' into Tanmay

Conflicts:
	RocketProjectTest/bin/src/GUIpack/RocketF$SPanel.class
	RocketProjectTest/bin/src/GUIpack/RocketF.class
Increase encapsulation
More frames commit
rrandom changes
add tabbed pane and stuff
Merge pull request #2 from tchordia/Tanmay

Tanmay