Updated until ye
latest commit before push
Merge branch 'dev2' of https://github.com/Valak12/CityBicycleCompanySecond into dev2
merge conflict fixed