[*]
Merge branch 'master' of https://github.com/cyz/cyz.github.com

Conflicts:
	portoseguro/_css/skin.css