pre-merge commit
merged files
modify readme and some settings
fix url
fix url
fix link
_config.yml, run rebase to merge markdown_parser
fix conflict
Merge branch 'develop' of github.com:SITW/blog into develop
readme.md, fix conflict part
readme.md, fix markdown typo
Rakefile, add preview command

Now, using `$ rake preview` is equal to `$ jekyll serve --watch --baseurl ''`
Add Gemfile.lock
Merge branch 'master' of github.com:SITW/blog
Fix some problems
add cname
Merge branch 'master' of github.com:SITW/blog
modify url
fix baseurl
fix path