Fixed a bug with the applySolution method

I thought I would need it but I am not actually using it.
Adjusted difficulty
Fixed a bug where conflicts wouldn't update

when starting a new game.
Minor refactoring of code that saves game
Merge branch 'master' into gh-pages