set up everything
merge conflicts
make about framework
merge conflicts
Merge pull request #3 from calblueprint/warren/make-about

Warren/make about