master commit 2

Conflicts:
	README.md