Add some diary notes.
Add new notes.
Merge branch 'master' of https://github.com/elkorn/wiki

Conflicts:
	index.wiki