cname change
Merge branch 'master' of github.com:yanshasha/yanshasha.github.com

Conflicts:
	CNAME
Merge branch 'master' of github.com:yanshasha/yanshasha.github.com

Conflicts:
	CNAME
	_posts/2013-09-22-decoration-tutorial2.md
add sensor