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

Conflicts:
	2D-Projekt/2D-Projekt.v12.suo
	2D-Projekt/2D-Projekt/Player.cs
added Tile.cs
added Map.cs
added selfmade collision
added some templates for the map