Merge pull request #1 from tinapc/dev

Merge dev to master (Add blog layout to master)