delete
commit
Merge branch 'master' of https://github.com/penouc/Front_end_practice

Conflicts:
	shixi_01/index.html