merge template and coding
Merge branch 'master' of github.com:opendream/polygraph