added logo, set up homepage
fixed merge conflict, updated base.css
Merge pull request #6 from quackhouse/development

merging css