changed gemfile to include ruby version
change sass version
change sass version
change sass version
change sass version
resolving conflicts
resolving conflicts
fixing dont know what!
more fixes... i am lost!
changes google fonts url
Merge branch 'master' into develop