updated css
Updated gemfile
updated home page
fixed merge conflicts
Merge pull request #10 from LasseSviland/master

updated css on homepage