Merge branch 'master' of C:\Users\KirbManDoon\IdeaProjects\icat with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/edu/odu/icat/graphicsinterface/WorkSpace.java
force panel
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/edu/odu/icat/graphicsinterface/WorkSpace.java
Merge remote-tracking branch 'origin/master'
force panel