moved summer research above board
moved summer research above board
Merge branch 'Marisol'
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Marisol
Merge branch 'Marisol'
About page now has summer team before advisory board
Merge branch 'master' into Samantha

Conflicts:
	public_html/sites/all/themes/cstt_theme/templates/node--about.tpl.php