jenkins fix
Merge branch 'gh-pages'

Conflicts:
	school-calendar/school-calendar.html
fixed conflict
Merge branch 'master' into gh-pages