no message
Merge branch 'master' of https://github.com/srodriguez511/Coursera

Conflicts:
	.gitignore