Changes! Includes tiwtter updates
Merge branch 'master' of https://github.com/StudentLifeMarketingAndDesign/dance-marathon

Conflicts:
	themes/dance/templates/Layout/HomePage.ss