The One
Merge branches 'master' and 'master' of https://github.com/sanchiaman/sample

Conflicts:
	README.md