Un pelo di commit
Merge branch 'master' of https://github.com/bedux/Caballeros

Conflicts:
	README.md