merge1
Merge remote-tracking branch 'luciker/master'

Conflicts:
	Form1.cs
mergetest