update gemset and ruby version
update content
updates to the styleguide based on the feedback from peytz and the SASS cleanup
bla
Merge pull request #6 from BenjaminMedia/features/update-styleguide

Features/update styleguide