Merge branch 'master' of https://github.com/WhiteWorld/blog

Conflicts:
	README.md
Merge branch 'master' of github.com:WhiteWorld/plog
a
add blogroll