Commiting the updated files from work session today
Commiting controller to upstream
Merge branch 'master' of https://github.com/mumush/medical-imaging.git