Merge branch 'master' of github.com:brson/rustray

Conflicts:
	main.rs
	math3d.rs
	model.rs