Changed Game class
Merge branch 'MergingError' of https://github.com/EvelynHischier/CityBuilder into MergingError
Changed Game class + added test