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

Conflicts:
	Medical Imaging System/bin/ImageViewerMenuBar$DefaultStudy.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
refixed check hasNextLine() in SystemSettings.java and
StudySettings.java that was overwritten
merge
Merge branch 'master' of
https://github.com/Botkilla2k12/se262project.git

Conflicts:
	Medical Imaging System/bin/ImageViewerMenuBar$DefaultStudy.class
	Medical Imaging System/bin/ImageViewerMenuBar$ToDispMode1.class
	Medical Imaging System/bin/ImageViewerMenuBar$ToDispMode4.class
	Medical Imaging System/bin/ImageViewerMenuBar.class
	Medical Imaging System/src/ImageViewerMenuBar.java
	Medical Imaging System/study.cfg