Testing git...
Exercise or the Course Project
Merge branch 'master' of https://github.com/toniborrallo/datasciencecoursera

Conflicts:
	HelloWorld.md

Merge exercise