GUI Work

Chris GUI Logic is just a temp package while i sort out some logic
Merge branch 'master' of https://github.com/cjsolomon/Mulit-Modal

Conflicts:
	MMRP/src/GUI/SegmentTable.java
	MMRP/src/core/Segment.java