Made a PictureController and cleaned up a little bit of code
Merge pull request #364 from cchan5/master

Made a PictureController and cleaned up a little bit of code