DISREGARD
Merge branch 'master' of https://github.com/roni-itai/ShopYourWayApp2

Conflicts:
	ShopYourWayApp`/HelloWorld.java