GOT IT WORKING AGAIN
Merge branch 'master' of github.com:dband/Arbeitsplaner

Conflicts:
	config.xml
	src/Utility/DBConnection.java
	src/ViewControllers/MainViewController.java
	src/Views/MainView.fxml
	src/arbeitsplaner/Arbeitsplaner.java
update gitignore
update gitignore