Edited README.md
Edited README
Edited README
Edited README sa as to confilct with that of master
Merge branch 'new'

Conflicts:
	README.md