updating grid info across all clients
fixed merge
Merge branch 'master' of https://github.com/kjian279/RISC