fixed problem with files
Merge remote-tracking branch 'origin/master'

Conflicts:
	scrabble.cpp