problem 2
Merge branch 'master' of https://github.com/huguogang/Web

Conflicts:
	test/euler.js