finished initial game
resolve merge
updated index.html