#1: added some methods in model and data objects
Merge branch 'feature/GuiFeature' of https://github.com/Saibot123/MauMau
into feature/GuiFeature

Conflicts:
	src/mvc/Model.java
	src/mvc/View.java