yes
Merge branch 'master' of https://github.com/mcfowland/juancollab

Conflicts:
	HI_ED_SUP.txt