Pulled recent stuff
Shopping cart counter
Fixed conflict
fixed merge conflict
Adjustments
Merge branch 'dev2' of https://github.com/Valak12/CityBicycleCompanySecond into dev2