Merge remote-tracking branch 'origin/update_prices'
Merge branch 'master' of https://github.com/yassomic/hackathon2