committing changes before pulling master
Merge branch 'master' of https://github.com/marineb/scrabble into mscndle
bla
resolving conflicts
Board stuff
95% of move validation done
constructed secondary words correctly
move validated
finalizing move validation
completed scores class
Merge branch 'mscndle'

Conflicts:
	src/Gameplay.java