try to create conflict
Merge branch 'master' of https://github.com/hackkerouac/gitPractice

Conflicts:
	readme.md

merging online edit with local