commit one on branch a
Added to Branch C
Merge branch 'branchc' into brancha
Merge branch 'brancha'

Conflicts:
	index.html