Merge branch 'master' into gh-pages
svg animation
Merge branch 'staging_animation' into gh-pages
Merge branch 'gh-pages'

Conflicts:
	school-calendar/school-calendar.html