dailyback
Merge branch 'master' of github.com:hhurricane/Diary

Conflicts:
	.zim/index.db

rm .zim dir tract