committing from mybranch1
branch2 commits
Merge branch 'mybranch1'

Conflicts:
	index.html