com
Merge branch 'master' of https://github.com/Dusan1/OnlineShopRepo

Conflicts:
	OnlineShopMVC/Views/Home/Index.cshtml