add blog page
reslove the confict
resolve the confict
Merge pull request #5 from chenbin92/portfolio-page

Portfolio page
resolve the config