Merge pull request #5 from annashipman/master

THE hot invitation of the summer!
stuff
Merge remote-tracking branch 'upstream/master'

Conflicts:
	diary/index.md

Forgot to pull upstream before merging and it seems you had already corrected my syntax error.