Grabbed stuff from Archer
added a lot
Merge branch 'dev2' of https://github.com/Valak12/CityBicycleCompanySecond into dev2
resolved merge conflict