Merge branch 'master' of https://github.com/changliwei/lnmp

Conflicts:
	README.md