Fix dem merges
Merge branch 'master' of github.com:JacobLeach/ChessGraphics