updates
Merge branch 'master' of https://github.com/jtarleton/chessnyc

Conflicts: