Ignore Files
Merge branch 'master' of https://github.com/matthew-johnson/Ray-Tracing

Conflicts:
	.gitignore
	.idea/workspace.xml