coding1
Merge branch 'master' of github.com:echohelloworld/coding

Conflicts:
	index.html
modify coding12