merging
updated version.
Merge branch 'master' of https://github.com/sterlingw/smacss