Merge branch 'master' of https://github.com/ThielHater/Test

Conflicts:
	Test/Program.cs
Merge branch 'master' of https://github.com/ThielHater/Test

Conflicts:
	Test/Program.cs