Docs
Merge branch 'master' of https://github.com/afraguela/toolbox

Conflicts:
	README.md