Merge branch 'master' of https://github.com/chrisporter/OpenFlKinect

Conflicts:
	README.md