Working on file parser
Merge branch 'master' of https://github.com/eyphka/raytracer

Conflicts:
	.DS_Store