commit -m "new branch"
git commit -m "violets are blue"
Merge branch 'prime'

Conflicts:
	index.html