update
Merge pull request #28 from daveology/master

Late commit.
update, late commit.
Merge pull request #29 from daveology/layout1

Layout1