committ

Signed-off-by: Brandon Ewoldt <bewoldt1@gmail.com>
Merge branch 'master' of https://github.com/StudentLifeMarketingAndDesign/vp-for-student-life

Signed-off-by: Brandon Ewoldt <bewoldt1@gmail.com>

Conflicts:
	themes/vp/templates/Layout/SelfHelpTopicsHolder.ss