db Redirect
Merge branch 'master' of github.com:quietshu/quietshu.github.io

Conflicts:
	CNAME