aa
Merge branch 'master' of github.com:Charlesdong/charlesdong.github.io

Conflicts:
	_site/index.html
	_site/page/category.html
	_site/page/feed.xml
	_site/sitemap.txt
add Exodus