ignore edited
Merge branch 'master' of https://github.com/galrath434/Cuda4Tracer

Conflicts:
	.gitignore