hi6
Merge branch 'master' of https://github.com/arielbro/ParSurf

Conflicts:
	WpfApplication1/MainWindow.xaml.cs
Merge branch 'master' of https://github.com/arielbro/ParSurf

Conflicts:
	WpfApplication1/MainWindow.xaml.cs
Merge branch 'master' of https://github.com/arielbro/ParSurf

Conflicts:
	WpfApplication1/MainWindow.xaml.cs