new
overwrite
Merge branch 'master' of https://github.com/coodoing/coodoing.github.io

Conflicts:
	_root/categories.html
	_root/index.html
	_root/pages.html
	data.yml