Merge branch 'master' of https://github.com/coolui/git-test.git

Conflicts:
	gittest/WebContent/index.html