local configuration
Merge branch 'master' of https://github.com/eliotik/ZenPen.git
merge