just changed a line to test git conflicts
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md