sensible readme
Merge branch 'master' of https://github.com/stutaylo/dummyrepo

Fixed a conflict

Conflicts:
	README