checking in painting code
Merge branch 'master' of github.com:psrthegreat/crossspacewaltz