added new diary activity
modify gitignore
Merge branch 'yuzhehu' of https://github.com/yiochen/AndroidDiaryApp.git
into yuzhehu
change manifest