Merge pull request #2 from JasonGuanGitHub/master

pull request
Merge pull request #1 from JasonGuanGitHub/master

get update
add
Merge pull request #3 from jitongming/master

change welcome index
Merge pull request #4 from luzhitong/master

add bootstrap files
Merge pull request #5 from specialhappy/master

Merge pull request #2 from JasonGuanGitHub/master
Merge pull request #1 from JasonGuanGitHub/master

update from master