Merge branch 'master' into mauricio
Revert 6c455af..661dbf5

This rolls back to commit 6c455af1bbf26b3737309ece6fe3349b33fb178e.
Pretty pictures
Merge branch 'master' into mauricio
Merge branch 'mauricio'

Conflicts:
	src/controllers/GameManager.java