practising a merge
Merge branch 'master' of https://github.com/serious-kiwi/datasciencecoursera

Conflicts:
	helloworld.md