preliminary about page
fixing merge conflict
Merge pull request #10 from calblueprint/warren-about-page

wooooo! gj!