rot
Merge branch 'master' of github.com:Aridane/DGC_P2
asdf
Merge branch 'Alvaro'

Conflicts:
	filters/Main_pde.pde
	filters/filters.pde
No se que cambie