Commit a peticion de git
fMerge branch 'master' of https://github.com/darkjavi/Notillus

Conflicts:
	Piezas-Nano/cajon/cajon_beta.fcstd
	Piezas-Nano/cajon/cajon_beta.fcstd1
Merge branch 'master' of https://github.com/darkjavi/Notillus

Conflicts:
	Piezas-Nano/cajon/old/cajon_alpha.fcstd
	Piezas-Nano/cajon/old/cajon_beta.fcstd
	Piezas-Nano/cajon/old/cajon_beta.fcstd.18d9d73b-2594-4dbe-9172-543be3b03aa5
Version magnetica del soporte para laca
Merge branch 'master' of https://github.com/darkjavi/Notillus