added diary
Merge remote-tracking branch 'WebAssignment/master'