Git in powershell
Merge branch 'master' of https://github.com/DoofDilla/test

Conflicts:
	windowsForm/windowsForm/Main.cs