Merge branch 'master' of https://github.com/leliveld/samples.git

Conflicts:
	README.md