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

Conflicts:
	Medical Imaging System/bin/.gitignore
	Medical Imaging System/bin/ImageViewerMenuBar.class
	Medical Imaging System/bin/Main.class
	Medical Imaging System/defaultstudy.cfg
	Medical Imaging System/src/ImageViewerMenuBar.java
	Medical Imaging System/src/Main.java