a line added
resolveMerge branch 'master' of https://github.com/zorankiki/datasciencecoursera