C4AndOthelloBoardStore conventions update
Merge remote-tracking branch 'origin/master'