test icon tao
modify gitignor
ignore .bak
ignore yaml
update ignore
Merge remote-tracking branch 'origin/master' into tao

Conflicts:
	.gitignore
update git-ignore
bloc the key
Delete key files
Merge remote-tracking branch 'origin/master' into jon