first post
0902
Merge branch 'gh-pages' of https://github.com/bjfuzzj/workdiary.git into gh-pages

Conflicts:
0903