Merge branch 'master' into mauricio
Saving changes
Merge branch 'master' into mauricio
Initialized board bug

Board was being called without initialization. Added some commented
debugging code.
Merge branch 'master' into mauricio

Conflicts:
	src/models/Game.java
	src/models/Player.java
Merge branch 'mauricio'