Merge pull request #4 from dpschaaf/Collage

Albums in progress, database associations for photos-album
seeding data from 4 albums
Merge branch 'master' into photo_parsing
Added photos to show at presentation
Merge pull request #5 from dpschaaf/photo_parsing

Added photo seeding
removed local directory call from seed
Merge pull request #6 from dpschaaf/photo_parsing

removed local directory call from seed
seeding with all remote references
pushing to heroku
still heroku
Merge pull request #7 from dpschaaf/to_heroku

To heroku
index on master: 17fa9cc Merge pull request #7 from dpschaaf/to_heroku
WIP on master: 17fa9cc Merge pull request #7 from dpschaaf/to_heroku