changed file
Merge branch 'master' of https://github.com/pgreskof/datasciencecoursera

Conflicts: