Added play timer, changed game timer, misc bug fixes
Polished game recording
Merge remote-tracking branch 'origin/master'
Merge