updated readme (hope it works)
Merge branch 'master' of https://github.com/macool/blog

Conflicts:
	README.md