update template
Merge branch 'master' of github.com:eddify/whinecombinator
Merge branch 'master' of github.com:eddify/whinecombinator