uncomment
Merge branch 'master' of https://github.com/7oi/whoopshop

Conflicts:
	Bordspil/Views/Home/Index.cshtml
Merge branch 'master' of https://github.com/7oi/whoopshop