no message
Merge branch 'master' of https://github.com/KaspYar/DormitoryVER2.0

Conflicts:
	src/controller/Controller.java
	src/model/Model.java