Merge branch 'Contracts'
Merge branch 'master' of https://github.com/rubenvanassche/City-Simulator