timer not working
Merge branch 'master' of https://github.com/zxmbies/SlidingPuzzle.git
not sure what changes I made...