first edits in my more-work branch
added some text, removed some text
sweet paragraph
Merge branch 'more-work'

Conflicts:
	readme.md