new template
Merge branch 'master' of https://github.com/manfeyn/manfeyn.github.com