Test

This is a test
Merge branch 'master' of https://github.com/Sniel/EatWhereProject

Conflicts:
	EatWhereWebApp/EatWhereWebApp/MyScripts/home-index.js
	EatWhereWebApp/EatWhereWebApp/Views/Home/Index.cshtml