merged stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	Medical Imaging System/bin/.gitignore
	Medical Imaging System/bin/Image.class
	Medical Imaging System/bin/SaveCommand.class
	Medical Imaging System/src/Image.java
bug fix and more merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	Medical Imaging System/bin/.gitignore
	Medical Imaging System/bin/StudySettings.class