Merge Implemented

At this point, the game is fairly functional. I also changed the color
scheme.