THINGS ARE DRAWN
Merge branch 'master' of github.com:theY4Kman/raytracer

Conflicts:
	.gitignore