git commit from clone branch
updated index on master v1
Merge branch 'master' of github.com:constantinpopa10/testgit2

Conflicts:
	WebContent/index.html
resolve merge conflict master into r2_index
finished feature on r2_index