Added a score field in player
Added a getter for score
Added a method to add points to player's score
Score is now displayed in a window.
Merge branch 'master' into player-score
Completed graphical display of player score
Merge branch 'master' into player-score

Conflicts:
	src/Carcassonne.java