fixing issue#225(deprecation...) by:
1,_config.yml; change "pygments: true" to "highlighter: pygments"
2,rss.xml&atom.xml; change "Layout: nil" to "Layout: null"
Merge pull request #226 from PetersonLian/master

fixing issue#225(deprecation warning)
New post "ACM题目：亲戚"
Merge commit 'c35069d29569694d0dbbb7bc68c3d779c0d5828f'

* commit 'c35069d29569694d0dbbb7bc68c3d779c0d5828f':
  fixing issue#225(deprecation...) by: 1,_config.yml; change "pygments: true" to "highlighter: pygments" 2,rss.xml&atom.xml; change "Layout: nil" to "Layout: null"

Conflicts:
	_config.yml