more createGameScreen tests added
Merge remote-tracking branch 'sean/master'
fixed backend compiling error
merging with sean
Merge remote-tracking branch 'sean/master'

Conflicts:
	Nonogram/gen/uw/cse403/nonogramfun/R.java
	Nonogram/src/uw/cse403/nonogramfun/HowToPlay2.java