Added for may
Fixed stuff
Merge branch 'dev3' of https://github.com/Valak12/CityBicycleCompanySecond into dev3