Second
Merge branch 'master' of https://github.com/raymondaj/SmartShopper

Conflicts:
	SmartShopperHackathon/SmartShopperHackathon/MainViewController.h