readme file update
Merge branch 'master' of https://github.com/8897/website

Conflicts:
	README.md