* re-write main.py and app.yaml / extend template
Merge branch 'master' of https://github.com/geekyjulie/mywebsites