resolving git with gerry, modifications on devise
Merge branch 'dev' into chore/create_specs_for_album
correcting specs for changes to user model
Merge branch 'dev' of github.com:JAdshead/photo_app into dev
correcting typo in user spec file