加了点字...
A new file...named my ID
summary
Merge branch 'xwz7' of https://github.com/abbshr/FoOTOo_Newbies_Trainning into abbshr-xwz7

Conflicts:
	README.md
	basic_task.md
Merge branch 'abbshr-xwz7'