test
Merge branch 'master' of https://github.com/Loafgoof/BokningsiteResturang.git
test
Test
Merge branch 'master' of https://github.com/Loafgoof/BokningsiteResturang.git
Merge remote-tracking branch 'origin/master'

Conflicts:
	BokningssiteResturang.v12.suo
	BokningssiteResturang/obj/Debug/BokningssiteResturang.Web.csprojResolveAssemblyReference.cache