finishing touches
Merge branch 'master' of https://github.com/ProDef/picture_this