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

Conflicts:
	shoppit/bin/R.txt
	shoppit/bin/classes/il/ac/huji/shoppit/ItemActivity.class
	shoppit/bin/classes/il/ac/huji/shoppit/ItemAdapter.class
	shoppit/bin/classes/il/ac/huji/shoppit/MainActivity.class
	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/classes/il/ac/huji/shoppit/ShopActivity.class
	shoppit/bin/classes/il/ac/huji/shoppit/ShopAdapter.class
	shoppit/gen/il/ac/huji/shoppit/R.java