rspec for photo and album
merge conflicts
Merge branch 'master' of github.com:BrandonWLee/wisdomsun