merging
Merge branch 'master' of https://github.com/lilisun/pentimento
style changes n stuff