Merge branch 'master' of https://github.com/seanjosephwu/nonogramFun
pull from sean's master branch
Merge branch 'master' of https://github.com/xiaoj/nonogramFun
get the version from Angel
pulled game from server to play a game
added logic in determining difficulty level of puzzle.
merging with Alan's change of fetchPuzzle for PlayAGame
Merge remote-tracking branch 'xiaoxia/master'
fetchPuzzle in PlayAGame done
Merge branch 'master' of https://github.com/xiaoj/nonogramFun
top and left of the game board now should have number fields hold at least 7 number, the large puzzle can be scroll, also first click the cell is black, second is question mark and then back to original color
number TextView and fetchPuzzle done, but bug @parseGameColumn in PlayAGame
fixed puzzle hints. It is working correctly now
added Hint button
pulling Alan's hint button
merge conflict fixed for hint button
hint system mostly done by Angel and Alan, with a small UI bug
socket port changed to 1025, hint system bug fixed
merging with the main branch