Fixed before pull
Merge branch 'article' of github.com:CoincoinNico/buylocally into article
Merge branch 'master' of github.com:CoincoinNico/buylocally into nicolas
nico
fixed conflicts
Image not fixed - Deleted unecessary views (update, destroy, create)
Links in nav bar
added explanation of errors in form
added links between pages
deleted redundant CSS
last commit before help on paperclip
bundle install, all ready to push to heroku
bundle install, all ready to push to heroku
thin gem to simulate Heroku env
mixing with AWS
works locally
config prod
Try to fix heroku app detected
mailcatcher fro development only, sqlite3
merged with master