Test commit
Add email template
Merge branch 'master' of https://github.com/welikepie/geekyconf