añadido matching
Nuevo commit
Merge branch 'master' of github.com:Aridane/DGC_P2

Conflicts:
	filters/Main_pde.pde
	filters/newMap.txt