git commit -m "added roses are red"
Merge branch 'prime'

Conflicts:
	index.html
Merge branch 'prime'

Conflicts:
	index.html