nothing to commit
Merge branch 'master' into models
added path to picture controller when parsing
Merge pull request #12 from oconn/models

Models