Some what working. Not really.
Merge branch 'master' of github.com:tmathews/template-webapp