Resolve conflict
Merge branch 'master' of https://github.com/amsterdam-scala/AS-Tiles-puzzle-solver