I added stuff
Merge branch 'master' into tykkedyr

Conflicts:
	Form1.cs