Merge pull request #4 from huangxinms/master

修改merge和commit流程
add database schema
use tinyint rather than int
Merge pull request #6 from huangxinms/master

提交单篇日记的显示页面，及通用的css
Merge pull request #5 from liaofeng/db_schema

add database schema