vdvd
Revert "qwer"

This reverts commit f3ca9ef684149954e8047ac973f0b9444e67eb69.
Revert "Revert "qwer""

This reverts commit daa1f1b4c5ddad4fddf4f479fe0bbeddd0b9c82e.
merge 1
add txt
kcldc
Revert "First commit"syes

This reverts commit 10d5b66a656c834fde26a5d8d80197c7479cc396.

Conflicts:
	WpfApplication1/MainWindow.xaml
	WpfApplication1/MainWindow.xaml.cs
hg
Merge pull request #2 from Maromarius/test

Test