Pulled recent stuff
Shopping cart counter
Fixed conflict
need to fix our data model
load works...yay i think
fixed merge conflict
Adjustments
Merge branch 'dev2' of https://github.com/Valak12/CityBicycleCompanySecond into dev2
implemented swipe to delete
merged resoled
 Storyboard changes to shopping cart and detailVCs
storyboard changes