Initial commit
skeleton
Merge branch 'master' of https://github.com/macool/blog

Conflicts:
	README.md
Merge branch 'macool'