delete files
Merge branch 'master' of github.com:linlincat/test-2

Conflicts:
	a.html