pulling Alan's tests
fixed merge conflict
pulling Alan's change on submit button
Merge branch 'master' of https://github.com/xiaoj/nonogramFun
MainActivity tests done by Huiqi Wang