change
Merge branch 'master' of https://github.com/xiaoyanit/xiaoyanit.github.io

Conflicts:
	.gitignore

On branch master
All conflicts fixed but you are still merging.

Changes to be committed:
modified:   .deploy
modified:   .gitignore
deleted:    node_modules/hexo-renderer-ejs/.npmignore
deleted:    node_modules/hexo-renderer-ejs/node_modules/ejs/.gitmodules
deleted:    node_modules/hexo-renderer-ejs/node_modules/ejs/.npmignore
deleted:    node_modules/hexo-renderer-ejs/node_modules/ejs/.travis.yml
deleted:    node_modules/hexo-renderer-marked/.npmignore
deleted:    node_modules/hexo-renderer-marked/node_modules/.bin/marked
deleted:    node_modules/hexo-renderer-marked/node_modules/marked/.npmignore
deleted:    node_modules/hexo-renderer-marked/node_modules/marked/.travis.yml
deleted:    node_modules/hexo-renderer-stylus/.npmignore
deleted:    node_modules/hexo-renderer-stylus/node_modules/.bin/stylus
deleted:    node_modules/hexo-renderer-stylus/node_modules/nib/.npmignore
deleted:    node_modules/hexo-renderer-stylus/node_modules/nib/.travis.yml
deleted:    node_modules/hexo-renderer-stylus/node_modules/nib/node_modules/.bin/stylus
deleted:    node_modules/hexo-renderer-stylus/node_modules/nib/node_modules/stylus/node_modules/cssom/.gitmodules
deleted:    node_modules/hexo-renderer-stylus/node_modules/nib/node_modules/stylus/node_modules/cssom/.npmignore
deleted:    node_modules/hexo-renderer-stylus/node_modules/nib/node_modules/stylus/node_modules/debug/.jshintrc
deleted:    node_modules/hexo-renderer-stylus/node_modules/nib/node_modules/stylus/node_modules/debug/.npmignore
deleted:    node_modules/hexo-renderer-stylus/node_modules/nib/node_modules/stylus/node_modules/debug/node_modules/ms/.npmignore
deleted:    node_modules/hexo-renderer-stylus/node_modules/nib/node_modules/stylus/node_modules/mkdirp/.npmignore
deleted:    node_modules/hexo-renderer-stylus/node_modules/nib/node_modules/stylus/node_modules/mkdirp/.travis.yml
deleted:    node_modules/hexo-renderer-stylus/node_modules/stylus/node_modules/debug/.jshintrc
deleted:    node_modules/hexo-renderer-stylus/node_modules/stylus/node_modules/debug/.npmignore
deleted:    node_modules/hexo-renderer-stylus/node_modules/stylus/node_modules/debug/node_modules/ms/.npmignore
deleted:    node_modules/hexo-renderer-stylus/node_modules/stylus/node_modules/glob/.npmignore
deleted:    node_modules/hexo-renderer-stylus/node_modules/stylus/node_modules/glob/.travis.yml
deleted:    node_modules/hexo-renderer-stylus/node_modules/stylus/node_modules/glob/node_modules/minimatch/.npmignore
deleted:    node_modules/hexo-renderer-stylus/node_modules/stylus/node_modules/glob/node_modules/minimatch/node_modules/lru-cache/.npmignore
deleted:    node_modules/hexo-renderer-stylus/node_modules/stylus/node_modules/mkdirp/.npmignore
deleted:    node_modules/hexo-renderer-stylus/node_modules/stylus/node_modules/mkdirp/.travis.yml