modified readme once
modified readme for the second time
Merge branch 'fix123'

Conflicts:
	README.md

merged two branches!