name changes
Merge branch 'master' of https://github.com/jacobtolar/mafmc-web

Conflicts:
	theme/resources.twig
	theme/sass/pages/_resources.scss