started animating
added animation of solution to SolutionEvaluator
fixed merge conflicts