Chat naar frame
Merge remote-tracking branch 'origin/development-master' into Chat_Ron

Conflicts:
	DeSlimsteMens/src/controllers/LobbyController.java
Merge pull request #37 from avans-os/Chat_Ron

Chat naar frame