测试 Promise
Merge branch 'master' of https://github.com/sunnylost/sunnylost.github.com

Conflicts:
	test/promise/index.html