add gitignore
remove output
Merge branch 'master' of https://github.com/lw02nju/blog
resolve merge conflict