Merge branch 'controller' into mauricio
GameModel Save
Comments deleted
BoardModel save
Don't save MAction
Player save
Action & SampleAction save
Save on MActions
Json Bugs
Merge branch 'controller' into mauricio
Merge branch 'mauricio' into controller

Conflicts:
	src/Models/BoardModel.java
Merge branch 'controller' into mauricio
Merge conflicts
Merge branch 'mauricio' into controller
Player and Cell save
Developer and PalaceCard save
updates
Merge branch 'controller' into mauricio
Merge branch 'mauricio' into controller
Merge branch 'controller' of https://github.com/ssyyddnneeyy/ChokingHazard-Iteration2 into controller