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

Conflicts:
	Medical Imaging System/bin/ImageViewerMenuBar$2.class
	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$ReconstructStudy.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$UndoOperation.class
	Medical Imaging System/bin/ImageViewerMenuBar$WindowingModeImage.class
	Medical Imaging System/bin/ImageViewerMenuBar$WindowingModeStudy.class
	Medical Imaging System/bin/ImageViewerMenuBar.class