Readme
Merge branch 'master' of https://github.com/Raysmond/Rays

Conflicts:
	README.md