修改
Merge branch 'master' of github-fscience:opensource-earth/earthip

Conflicts:
	main.js