so-simple
Merge branch 'master' of https://github.com/s/s.github.io

Conflicts:
	README.md
	_config.yml
	_layouts/post.html
	index.html
so-simple