Updated spacing and about page
Updating template files and modules
Updating modules and template files
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite
Adding embedded Google form
Adding embedded Google form
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite into Samantha
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'
Updated CSS for about page
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
Formatted about page and template page for space under footer
Updating browse-all template files
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite
Updated contribute formatting
Merge branch 'master' of https://github.com/CSTeachingTips/CSTTSite
Fixing the contribute form formatting