first commit test
Merge branch 'master' of https://github.com/fcornejo/datasciencecoursera

 especially if it merges an updated upstream into a topic branch.
conflicto