I'm on fire
Merge branch 'master' into controller
Merge branch 'controller' into mauricio

Conflicts:
	src/Controllers/BoardController.java
	src/Controllers/GameController.java
	src/Models/Actions/DrawPalaceCardAction.java
Merge branch 'mauricio' into controller
Merge branch 'controller'