README.md
encore
Merge branch 'master' of https://github.com/larryval/MOOC_git

Conflicts:
	README.md