More changes to the branch code to cause conflicts
Merge remote-tracking branch 'origin/branch1'

Conflicts:
	cryptids/docroot/index.html
took branch changes because they are newer