finished! :)
Merge branch 'master' of https://github.com/byuipathway/pathway.lds.org

Conflicts:
	pages/what_is_pathway/l_version/cost.html
	pages/what_is_pathway/s_version/cost.html