restore
Merge branch 'master' of https://github.com/EladYona/FoodChain

Conflicts:
	foodchain/Views/Home/Index.cshtml
	foodchain/Views/Shared/Error.cshtml