Creating template
Merge branch 'master' of ssh://p2-wilburzhao.rhcloud.com/~/git/p2