Merge pull request #35 from IRelaxxx/Alex-Dev

Alex dev
Merge pull request #36 from IRelaxxx/Alex-Dev

Alex dev
Random Commit
irgendwas ist schon wieder zu commiten, dont ask me
Merge branch 'Alex-Dev' into Gustav-Dev
Merge branch 'Gustav-Dev' into Alex-Dev

Conflicts:
	2DPlatformer/2DPlatformer-csharp.sln
	2DPlatformer/2DPlatformer.sln
	2DPlatformer/Assembly-CSharp-vs.csproj
	2DPlatformer/Assembly-CSharp.csproj