merge
change Gemfile
Merge branch 'master' of https://github.com/niksan/edem-design
move to sass and add some caching