Merge pull request #1 from Fav/master

Signed-off-by: fav <f25457@qq.com>
Merge pull request #2 from Fav/master

Master
Update 2014-10-25-setting-a-webpage.html
Signed-off-by: fav <f25457@qq.com>