scaffolding and layout
Merge branch 'master' of github.com:zelliott/wonderwoman