Added a score field in player
Added a getter for score
Added a method to add points to player's score
Added a text file with the tiles. Started adding a scanner
Scans in a text file, makes an array of tiles.
Score is now displayed in a window.
Merge branch 'master' into player-score
Completed graphical display of player score
Added some comments, a new method for setting up the tiles, and a Carcassonne test
Merge branch 'master' into player-score

Conflicts:
	src/Carcassonne.java
Merge branch 'master' into TileDistribution

Conflicts:
	src/Carcassonne.java
	src/Tile.java
Merge branch 'master' of ssh://github.com/PeterDrake/Carcassonne-Drosophila

Conflicts:
	src/Carcassonne.java
merged master in