Merge branch 'master' of heroku.com:omr-pinteresting18
merging
Merge branch 'master' of github.com:IlBedussa/Pinteresting
merging with master