second commit
Merge branch 'master' of https://github.com/dr-schultz/FirstRepo.git

Conflicts:
	TestProject/WebContent/html/index.html
commit
Merge branch 'master' of https://github.com/dr-schultz/FirstRepo.git