funciona
Merge branch 'master' of https://github.com/AdrianMBarrera/PFCGoniometro

Conflicts:
	PFCGoniometro.userprefs