Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Making variables out of my jquery selectors to not repeat myself