part 3
Merge branch 'master' of https://github.com/OCLarocque/Hello-World

Conflicts:
	README
part 5