conflict: Roses are purple
Merge branch 'conflict'
Choosing Golden

Conflicts:
	README.md