typos ftw
Merge branch 'master' of https://github.com/TEDxUMassAmherst/tedx-umassamherst-website

Conflicts:
	packages/system/public/controllers/index.js