Calculation on its way
Merge branch 'MergingError' of https://github.com/EvelynHischier/CityBuilder into MergingError
Merge branch 'MergingError' of https://github.com/EvelynHischier/CityBuilder into MergingError
Calculation still on progress