first commit test
resolving conflict

Merge https://github.com/EugeneRich/datasciencecoursera