20131231
ss
Merge branch 'master' of https://github.com/syh1011/javascript.git

Conflicts:
	test10.html