modified:   src/views/MainWindow.java
	modified:   src/views/PythonTokenMarker.java
Merge branch 'master' of github.com:kurosch/Bachelorarbeit