Merge branch 'master' of https://github.com/stefaan-coussement/Play-with-github

Conflicts:
	README.md
Merge branch 'master' of https://github.com/stefaan-coussement/Play-with-github

Conflicts:
	README.md