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

Conflicts:
	Medical Imaging System/bin/ImageViewerWindow$ButtonListener.class
	Medical Imaging System/bin/ImageViewerWindow.class
	Medical Imaging System/bin/Main.class
	Medical Imaging System/bin/StudySettings.class
	Medical Imaging System/bin/SystemSettings.class