Expanded HSB GUI, and hooked up the supporting functionallity
Expanded HSB GUI, and hooked up the supporting functionallity
Added HSBPanel.java
Reconciliation commit
attempt to pull for push

Conflicts:
	Settings/SD.pmo
	src/main/java/project/senior/app/pormmo/SettingsDock.java
	src/main/java/project/senior/app/pormmo/UserInterfaceFrame.java
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$FrameListener.class
	target/classes/project/senior/app/pormmo/UserInterfaceFrame$UserInterfaceFrameMenuListener.class