* Ignore photos
* Merge conflict in Gemfile.lock
Merge branch 'master' of github.com:asteroidb612/spoons
* Fix...
Merge branch 'master' of github.com:asteroidb612/spoons