modify welcome
Merge remote branch 'upstream/master'

Conflicts:
	README.md