Introducing a conflict
Merge branch 'master' of github.com:froriz5/FindMyStuff

Conflicts:
	README.md

Split the difference, 1 space won.