temp
temp2
add timer
Merge branch 'master' of https://github.com/xiaoj/nonogramFun
Merge remote-tracking branch 'xiaoxia/master'
Merged with the main branch (Sean's repo), and need to merge with xiaoxia's branch now.
submit button for PlayAGame done
merging with xiaoxia
Merge remote-tracking branch 'xiaoxia/master'
submit button for PlayAGame done
merging with Timer and Submit from Xiaoxia's branch
PlayAGame submit button partially done by Renhao Xie, hint system and timer fully implemented by Huiqi Wang, Alan Loh and Xiaoxia Jian
Merge remote-tracking branch 'upstream/master'