README
s
removed conflicts
Conflicts:
	README.md
changes from feature branch
Merge branch 'feature'

Conflicts:
	README.md