Creating a merge conflict
Merge branch 'master' of https://github.com/riax/just-testing

Conflicts:
	WebApplication1/WebApplication1/HtmlPage1.html