merging
Merge branch 'master' of https://github.com/lilisun/pentimento
scrubbing with transforms and no clicking deleted stuff
Merge branch 'master' of https://github.com/lilisun/pentimento
adding doctype