added two templates, test
Merge branch 'master' of https://github.com/longfei-wang/mightyscreen