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
capybara removed for upload
capybara removed for upload
updated key info
fix heroku
ahh
asf
gemlock
fixed display order
fixed conflicts
fixed vote links to not display after user has voted
added pagination to welcome page
Merge branch 'pagination' into dev
style
fixing commit
fixed major conflicts
fixed user role