Merge of the current working state of the game

Game mechanics are done