oezrzrz
Merge branch 'master' of https://github.com/bomber34/Intro2DFirst

Conflicts:
	Beispiel/Intro2D-Map und Kollision/Intro2D-02-Beispiel.v12.suo
	DeathofDoge/DeathofDoge.v12.suo
	DeathofDoge/DeathofDoge/bin/Debug/DeathofDoge.exe
	DeathofDoge/DeathofDoge/bin/Debug/DeathofDoge.pdb
	DeathofDoge/DeathofDoge/bin/Debug/Picture/Map1.png
	DeathofDoge/DeathofDoge/obj/Debug/DeathofDoge.exe
	DeathofDoge/DeathofDoge/obj/Debug/DeathofDoge.pdb