add raw diary
Merge branches 'master' and 'diary'