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

Conflicts:
	shoppit/bin/R.txt
	shoppit/bin/Shoppit.apk
	shoppit/bin/classes.dex
	shoppit/bin/classes/il/ac/huji/shoppit/R$id.class
	shoppit/bin/classes/il/ac/huji/shoppit/R$string.class
	shoppit/bin/classes/il/ac/huji/shoppit/R$styleable.class
	shoppit/bin/resources.ap_