add diary view controller
add diary table cells
Merge remote-tracking branch 'origin/master'
merge
merge
Merge remote-tracking branch 'origin/master'
add diary view controller