20131224
Merge branch 'master' of github.com:codepongo/diary