Added endgame detection, cleaned up Scorer, added distinction between Tile filename and type, fixed GUI syntax
added color field and getter to player, so that could would compile
modified game
Merge branch 'master' into tileplacement

Conflicts:
	src/Board.java
	src/GUI.java
	src/Game.java
modified GridComponent
Modified TileComponent.java
modified game
modified GUI, game and GridComponent