cocoapods
added pods
Merge branch 'shoppingCart' into dev2
merging
Merge branch 'dev2' into shoppingCart