positionierungen
Merge remote-tracking branch 'origin/master'

Conflicts:
	MainVis/ViewController.pde
Merge branch 'master' of https://github.com/VeronikaH/InfoVis