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

Conflicts:
	src/controller/PinchoController.php