merge
iii
Merge remote branch 'upstream/master'

Conflicts:
	package.json
	public/build/index.js
add the third page
Merge remote branch 'upstream/master'
Merge pull request #2 from lucknessbuaa/master

add the third page