Merge branch 'master' of https://github.com/Fehler42/2D-Project

Conflicts:
	2D-Projekt/2D-Projekt.v12.suo
fixxed some bugs
Merge branch 'master' of https://github.com/Fehler42/2D-Project

Conflicts:
	2D-Projekt/2D-Projekt.v12.suo