Instagram to Photo model
Fixed merger conflict
Merge branch 'master' of github.com:BLNorris/flipbook