cambios
Merge branch 'master' of https://github.com/agonbar/pinchOS

Conflicts:
	src/model/Pincho.php