cleaned up deleted activities and changed title text of activities to
match their activities
Merge branch 'master' of https://github.com/seanjosephwu/nonogramFun
color button
images
merge xiaoxia
Commented out failing test
Merge branch 'master' of https://github.com/seanjosephwu/nonogramFun
fix merge conflict with sean
more tests done