Temporary commit to allow merging.
Merge branch 'Bonus' into swapping

Conflicts:
	bin/Game.class
	bin/GameTest.class
	bin/Player.class
	bin/PlayerTest.class
	src/DrawBoard.java
	src/Game.java
	src/Player.java
User can swap tiles if appropriate after placing a tile.
Merge branch 'master' into swapping

Conflicts:
	bin/Game.class
	bin/GameTest.class
	bin/Player.class
	bin/PlayerTest.class
	src/Game.java
	src/PlayerTest.java
Merge branch 'master' into swapping

Conflicts:
	bin/PlayerTest.class
Fixed Game.main() to call Game.play() instead of Game.placeTile().
Fixed canSwap() to only allow swapping if player has no tiles with the minimum-scored color.
Merge branch 'master' into swapping

Conflicts:
	bin/Board.class
	bin/Game.class
	bin/GameTest.class
	bin/Player.class
	bin/TileGUI.class
	src/Player.java
	src/UIState.java
Fixed swapping.
Merge branch 'master' into swapping

Conflicts:
	bin/Game.class
	bin/GameTest.class
	src/DrawBoard.java
	src/Game.java
	src/UIState.java