asdf
Fixed edge generation?
Merge branch 'aridane'

Conflicts:
	filters/Main_pde.pde
view a�adido
Mas Actualizado
Hice que funcionara que no compilaba
Merge branch 'master' into Alvaro

Conflicts:
	filters/Main_pde.pde
	filters/filters.pde