wekt
rgMerge branch 'master' of https://github.com/PinkFluffyUnicorn/TotalCoolesSpiel

Conflicts:
	Vampir/Vampir/Vampir.csproj
´rrgg
Merge branch 'master' of https://github.com/PinkFluffyUnicorn/TotalCoolesSpiel
Merge branch 'master' of https://github.com/PinkFluffyUnicorn/TotalCoolesSpiel