some corrections
Merge branch 'master' of https://github.com/Casyfill/Columbia_workshop

Conflicts:
	README.md