Major refactoring of main.cpp
Added class Board
Fixed merge conflicts
Merge conflicts