rearrange
Merge branch 'master' of https://github.com/scobin/PaintTest