Merge pull request #29 from eric-townsend/lolz

Lolz
Merge pull request #30 from eric-townsend/lolz

all pages in!
Merge pull request #31 from eric-townsend/lolz

finishing
fixing spelling
getting up to date