Merge branch 'master' of https://github.com/samcal/samcal.github.io

Conflicts:
	css/main.css
stray quote