Colors
Merge branch 'master' of https://github.com/pnic/Bachelor

Conflicts:
	src/LinearArcPlotEditor/LAP.java
	src/LinearArcPlotEditor/LAPEditor.java
merged with my changes
colors added