started website
started hotfix
web modified
fixed something
Merge branch 'web'

Conflicts:
	index.html
	test

change is ok
On branch test
new content
On branch master
new content
Merge branch 'test'

Conflicts:
	content.html
resolved