minor changes. shift still not working
.orig files should not be committed
Merge branch 'master' of https://github.com/peregrinustyss/Till

Conflicts:
	Assets/Kassa1.unity
	Assets/Resources/Prefabs/Items/banana.prefab
	Assets/Resources/Prefabs/Items/banana.prefab.meta
	Assets/Resources/Prefabs/Items/condom.prefab
	Assets/Resources/Prefabs/Items/milk.prefab
	Assets/Resources/Prefabs/Items/milk.prefab.meta
	Assets/Resources/Prefabs/Items/wine.prefab
	Assets/Resources/Prefabs/Items/wine.prefab.meta
	Assets/Resources/materials/items/Materials/banana.mat
	Assets/Resources/materials/items/Materials/banana.mat.meta
	Assets/Resources/materials/items/Materials/condom.mat
	Assets/Resources/materials/items/Materials/condom.mat.meta
	Assets/Resources/materials/items/Materials/milk.mat
	Assets/Resources/materials/items/Materials/milk.mat.meta
	Assets/Resources/materials/items/Materials/wine.mat
	Assets/Resources/materials/items/Materials/wine.mat.meta
	Assets/Resources/materials/items/banana.tga
	Assets/Resources/materials/items/banana.tga.meta
	Assets/shopping Items/banana/Materials/banana.tga
	Assets/shopping Items/banana/Materials/banana.tga.meta
	Assets/shopping Items/banana/banana.tga
	Assets/shopping Items/banana/banana.tga.meta