Merge pull request #1 from demonkit/master

合并
Merge remote-tracking branch 'demonkit-note/master'
Add my .vim file and the .gitignore file
Merge pull request #1 from sunjun/master

merging from sunjun