placeholders
Merge branch 'master' of github.com:frank611/shorthand