Merge branches 'master' and 'gh-pages' into gh-pages
Merge branch 'gh-pages' of github.com:jamielynnroth/appliedacademics into gh-pages