.
.
Merge branch 'master' of https://github.com/nyaong/nyaong.github.com

Conflicts:
	index.html
	static/css/default_layout.css