add icon
change icon
change test
update
Merge branch 'master' of https://github.com/IrinaUkrainets/SketchPad into IrinaUkrainets-master
update
check confilict