nothing
Merge branch 'master' of https://github.com/kgnvch/Shoppit

Conflicts:
	shoppit/bin/classes/il/ac/huji/shoppit/CameraFragment.class
	shoppit/bin/jarlist.cache