added validation in album
added validations
conflicts fixed in update photos_controller and albums_controller
Merge branch 'dev' of github.com:JAdshead/photo_app into dev