Test
Merge branch 'master' of https://github.com/FretCode/WPFMW

Conflicts:
	main.html