Fixed view controller so that it isn't all hacky for getting the images
Merge remote-tracking branch 'origin/lab7-home' into development
Merge branch 'development' into release-lab7
Merge branch 'release-lab7'