test local change
Merge branch 'master' of https://github.com/K0F/globeOstrava

Conflicts:
	planar2/planar2.pde