Enabled the Save and Save As button
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/edu/odu/icat/graphicsinterface/WorkSpace.java
Merge remote-tracking branch 'origin/master'
nothing changed just fixed the issues with my version
Merge branch 'master' of https://github.com/danielspangler/icat
nothing changed just fixed the issues with my version
Merge branch 'master' of https://github.com/danielspangler/icat

Conflicts:
	src/main/java/edu/odu/icat/controller/Control.java
Merge branch 'master' of https://github.com/danielspangler/icat
Merge branch 'master' of https://github.com/danielspangler/icat

Conflicts:
	src/main/java/edu/odu/icat/controller/Control.java
Merge branch 'master' of https://github.com/danielspangler/icat
Merge branch 'master' of https://github.com/danielspangler/icat

Conflicts:
	src/main/java/edu/odu/icat/controller/Control.java
Merge branch 'master' of https://github.com/danielspangler/icat
Merge branch 'master' of https://github.com/danielspangler/icat

Conflicts:
	src/main/java/edu/odu/icat/controller/Control.java
Minor fixes
Merge remote-tracking branch 'origin/master'