Fixed score calculation

Score is now calculated iteratively by summing the tiles that are merged in a move.
Merge branch 'master' of https://github.com/mmiermans/solver2048