fix bug
fix bug
change back draft
correct mistake
Merge branch 'newfeature' of https://github.com/lixu8818/myfirstgit into newfeature

Conflicts:
	draft.txt