creating first branch
changes in branch1
Merge branch 'branch1'

Conflicts:
	cryptids/docroot/index.html
manually merged conflicting lines