initial commit of working copy
update layout
Revert "update layout"

This reverts commit d6241a96077a74c3ce0b4ae830e05edb1d7db759.
Merge branch 'dev' of https://github.com/hdc/jgregory into dev
no message