Palace Festival stuff
Replay mode
Merge
Merge
replay mode
Replay Mode
Fixes
Planning/play mode
Systems.outs commented out
Merge branch 'controller' into mauricio

Conflicts:
	src/Controllers/GameController.java
Merge branch 'mauricio' into controller