- to redcarpet
Merge branch 'master' of https://github.com/lightDer/lightder.github.io

Conflicts:
	_config.yml