Merge pull request #8 from calblueprint/warren-about-page

preliminary about page
Revert "preliminary about page"
Merge pull request #9 from calblueprint/revert-8-warren-about-page

Revert "preliminary about page"
fixing merge conflict