ugly board
fix conflicts
table board
Merge branch 'dev' of https://github.com/Arielle919/Nashopoly into dev