diagramm update
nothing
Merge branch 'master' of https://github.com/Lene91/Visualisierung

Conflicts:
	InfoVis_Assignment_SS12/src/infovis/scatterplot/View.java