Fungerende
Merge branch 'master' of https://github.com/emilnygaardfrisk/OPN_Assignment2

Conflicts:
bin/client/ClientController.class
bin/server/Main.class
src/server/Main.java
..