wip fix css for description
fix merge conflicts
initial homepage design
fix merge conflicts
fix home page css
remove excess css file
update logo
Merge branch 'master' into design_home_page
Merge pull request #29 from cicadas-2014/design_home_page

Design home page