changed px to em, dur
updated conflicts
Merge branch 'gh-pages' of https://github.com/dope/slice into gh-pages