pulling from repo
Merge branch 'master' of https://github.com/jdsteinbach/jds-theme

Merge