miaov js exercise 211
Merge branch 'master' of https://github.com/s5s5/jsExercise

Conflicts:
	miaov/211.html