Added font scaling as puzzleview resizes
Merge branch 'master' into history-tracking
Added backtracking code