merge commit
Merge branch 'master' of https://github.com/byuipathway/pathway.lds.org

Conflicts:
	js/min/drawer.min.js