2
Merge branch 'master' of https://github.com/yoshinoGam/testHub.git

Conflicts:
	Test/WebContent/index.html
3