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

Conflicts:
	shoppit/bin/Shoppit.apk
	shoppit/bin/classes.dex
	shoppit/bin/classes/il/ac/huji/shoppit/CameraFragment.class

shoppit/bin/dexedLibs/android-support-v7-appcompat-dee782c19d1174056d670
a138df804d0.jar
	shoppit/bin/dexedLibs/facebooksdk-9c0dade2339126534bf719b96b1efeae.jar

shoppit/bin/dexedLibs/google-play-services_lib-691c24f9fd599d00fcab49a9a
1e9c207.jar
	shoppit/bin/jarlist.cache
	shoppit/bin/resources.ap_