adding amazon
amazon v2
amazon v3
fixed config for s3
Merge branch 'dev'
nothing
nothing
Added an edit link to photos and added the collection descriptions.
Fixed tags so when you click a tag it shows the photos
last night
done on this branch
fixed the edit button
Updated seed file
Updated Users and Finished Autocomplete
final version before presentation
resloved seed file
Sorted seed file
my final working version
Merge branch 'dev' of https://github.com/YasminRazavi/photo_sharing_app into dev
final version resolved conflicts to be on heroku