Scoring Update
Merge branch 'master' of https://github.com/XSyk0X/ScrabbleProject

Conflicts:
	ScrabbleGame/build/classes/scrabblegame/window.class