Merge branch 'master' of https://github.com/huuuxi/Diarys.git

Signed-off-by: huuuxi <huuuxi@gmail.com>
Signed-off-by: huuuxi <huuuxi@gmail.com>
Merge branch 'master' of https://github.com/huuuxi/Diarys.git

Conflicts:
	Diarys/Unfinish/unfinish