from git_cloned
Merge branch 'master' of https://github.com/spetznova/Carpentry

Conflicts:
	hello.txt