updated calendar
added major dates
git is being confusing
Merge branch 'master' into gh-pages

Conflicts:
	.DS_Store
	compsci/.DS_Store
.DS_Store banished!