branch conflict added
Merge branch 'willconflict'

Conflicts:
	README.md