Updated Squashes
Merge branch 'master' of https://github.com/Milez213/CityTrial