Rydder op i Asgers kode
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/DatabaseLogic/DatabaseConnection.java
	src/databaseMethods/SwitchMethods.java
Merge branch 'master' of https://github.com/Distribuerede-systemer/server