added window2
Merge branch 'develop' of https://github.com/kkralj1/test-repo2 into develop

Conflicts:
	WpfApplication1/MainWindow.xaml