Calendar to match reality; old headings remain tho

Conflicts:
	index.html