original commit
Merge branch 'master' of github.com:charlieclark/template