commit2
Merge branch 'master' of https://github.com/webpublisher/git_test

Conflicts:
	index.html