readme
readme
Merge branch 'master' of https://github.com/dazKind/foo3D

Conflicts:
	README.md