minor change to navbar and edit view
Merge pull request #16 from edouardpo/minor-changes-to-navbar-and-edit-view

minor change to navbar and edit view
implemented pundit for authorizations
solved conflicts for merginf to master
Merge pull request #17 from edouardpo/implementing-pundit-for-authorizations

implemented pundit for authorizations
link deleted in shops/edit
trying to fix link to show from index in heroku
trying to fix link to show from index in heroku #3
seed completed
Merge pull request #18 from edouardpo/creating-seed-for-db-in-db/seeds.rb

seed completed
done editing for today
redesigned file upload button
Done playing. TODO: remove blank at bottom of all pages, put a default picture for shops in index.html, add shop pictures to home carroussel
Add Figaro
reinstalled figaro
Merge pull request #20 from edouardpo/setup-s3

Setup s3
final changes on front end
Merge pull request #21 from edouardpo/minor-changes-on-front-end

Minor changes on front end
solved conflict with master