compile assets
change deploy branch
add config.yml
modify config
modify header
modify header
modify 404 page
Merge branch 'deploy_branch1' into deploy_branch

Conflicts:
	config/config.yml
Merge branch 'deploy_branch'
add markdown tips