mitt
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestRepo.v12.suo
	TestRepo/HtmlPage1.html