unconflicting merge
Changed some styles and added gameBoard