Reworked game board and messed up timer
timer didnt commit??
Merge branch 'dev'