Merge branch 'master' of https://github.com/CarlesCG/datasciencecoursera

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/CarlesCG/datasciencecoursera

Conflicts:
	.gitignore