template dev
Merge pull request #1 from yellowforblack/develop

template dev