v1.0.4

新增
Merge remote-tracking branch 'origin/master'

Conflicts:
	安安你好.txt
v1.0.5

刪除