Merge branches 'master' and 'dev' of https://github.com/yusuf-a/patzerChess