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

Conflicts:
	Bordspil/Bordspil.csproj
Merge branch 'master' of https://github.com/7oi/whoopshop