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

Conflicts:
	Medical Imaging System/bin/StudySettings.class
	Medical Imaging System/defaultstudy.cfg
SystemSettings.java and StudySettings.java

checked sc.hasNextLine() before getting the next line
Merge branch 'master' of
https://github.com/Botkilla2k12/se262project.git

Conflicts:
	Medical Imaging System/defaultstudy.cfg