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

Conflicts:
	Medical Imaging System/bin/Image.class
	Medical Imaging System/bin/Study.class
	Medical Imaging System/src/Image.java
	Medical Imaging System/src/Study.java
Implemented the composite pattern with Study and Image