fixed class name
pulling Zhe Shi's change
pulling Zhe Shi's change
Merge remote-tracking branch 'sean/master'

Conflicts:
	Nonogram/gen/uw/cse403/nonogramfun/R.java
	Nonogram/src/uw/cse403/nonogramfun/HowToPlay2.java
merging with sean
merging
merge
merge
eror handler and cell test done
fixed timer on play screen to not be part of the scroll view
Merge branch 'master' of https://github.com/seanjosephwu/nonogramFun
test scenario added for game board testing
fixed the game returning to main menu after trying to submit a wrong
solution
HowToPlay tests done
Merge remote-tracking branch 'sean/master'