adding conditional for showing album edit to album owners
making some edits
fixing merge conflict
modifying regex validations
modifying gem file
hamling up a few pages
all dem pages got hamled cuz
Merge branch 'master' of github.com:emmaviolet/photo_sharing_app
last bit of hamling