updates
Merge branch 'master' of https://github.com/law826/radiology_diagnoser

Conflicts:
	.DS_Store