resolving conflicts
fixing merge issues
Merge branch 'master' of https://github.com/marineb/scrabble