DisplayState update, GUI button update

Added methods to DisplayState, implemented a toggle button for the
different states (needs work)
Forgot to commit these
Merge branch 'master' of https://github.com/cra5370/swen262-project

Conflicts:
	build/classes/medicalimaging/MedicalImaging.class
	src/medicalimaging/MedicalImaging.java
main class