Merge pull request #1 from lnanglin/development

Create 2014-08-06-file.md
Merge pull request #2 from lnanglin/development

Delete 2014-08-06-file.md
Update _config.yml
Update _config.yml
Update _config.yml
Update about.md
Update about.md
Update _config.yml
Update _config.yml
Update _author-bio.html
Update _author-bio.html
Update _config.yml
Update _author-bio.html
Update _navigation.html
Update _navigation.html
Update _navigation.html
Update _navigation.html
Merge pull request #3 from lnanglin/master

merging master with dev