Updated Picture class
Merge branch 'master' of github.com:CMPUT301F14T05/CorgFu