Revert "Merge"

This reverts commit 9c9252812fe05e3f5df8e69c379109e0d01fe86b.
Merge branch 'master' of https://github.com/jostjernberg/othello