Mads design derudaf min apprentice
.
Merge branch 'master' of https://github.com/Distribuerede-systemer/server

Conflicts:
	src/GUI/AddCourse.java
	src/GUI/UserList.java
Merge branch 'master' of https://github.com/Distribuerede-systemer/server