fixed various errors
Merge branch 'master' of https://github.com/SebastianMH/Raytracer

Conflicts:
	Helpers.cpp
	makefile