html templating
Merge branch 'master' of github.com:bergeron/Ephemeral