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

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