Made Image an object, and had to comment out a bunch of stuff in the Controller to make it compile
Merge branch 'master' of ssh://github.com/Torboto/cmput301W13T07