do some changes for my blog
Merge branch 'master' of github.com:xbot/whiterspace

Conflicts:
	sass/screen.scss