fixed displaying board
solving merge conflict
Merge branch 'master' of https://github.com/mushi22/COMP2911