Creating a merge conflict on purpose :)
Merge branch 'master' of https://github.com/aka821/playgit

Conflicts:
	readme