merge
Merge branch 'master' of
https://github.com/Botkilla2k12/se262project.git

Conflicts:
	Medical Imaging System/study.cfg
set radiobutton equal to the displaymode for the study, added getters to
the displaymode in study settings
Merge branch 'master' of
https://github.com/Botkilla2k12/se262project.git

Conflicts:
	Medical Imaging System/bin/ImageViewerMenuBar$DefaultStudy.class
	Medical Imaging System/bin/ImageViewerMenuBar$OpenFile.class
	Medical Imaging System/bin/ImageViewerMenuBar$SaveStudy.class
	Medical Imaging System/bin/ImageViewerMenuBar$ToDispMode1.class
	Medical Imaging System/bin/ImageViewerMenuBar$ToDispMode4.class
	Medical Imaging System/bin/ImageViewerMenuBar.class
	Medical Imaging System/bin/SystemSettings.class
	Medical Imaging System/src/ImageViewerMenuBar.java
	Medical Imaging System/study.cfg
Merge branch 'master' of
https://github.com/Botkilla2k12/se262project.git

Conflicts:
	Medical Imaging System/bin/ImageViewerMenuBar$DefaultStudy.class
	Medical Imaging System/bin/ImageViewerMenuBar$ExitProgram.class
	Medical Imaging System/bin/ImageViewerMenuBar$OpenFile.class
	Medical Imaging System/bin/ImageViewerMenuBar$SaveStudy.class
	Medical Imaging System/bin/ImageViewerMenuBar$ToDispMode1.class
	Medical Imaging System/bin/ImageViewerMenuBar$ToDispMode4.class
	Medical Imaging System/bin/ImageViewerMenuBar.class
	Medical Imaging System/bin/ImageViewerWindow$ButtonListener.class
	Medical Imaging System/bin/ImageViewerWindow.class
	Medical Imaging System/bin/Main.class
	Medical Imaging System/src/ImageViewerMenuBar.java
	Medical Imaging System/study.cfg
Merge branch 'master' of
https://github.com/Botkilla2k12/se262project.git

Conflicts:
	Medical Imaging System/bin/ImageViewerWindow.class
Merge branch 'master' of https://github.com/Botkilla2k12/se262project.git