Added config file
Merge branch 'master' of https://github.com/phresco/iphone-native-arc-shoppingcart

Merge conflicts