Lots of changes
Update to readme.md

Conflicts:
	readme.md