fixing square
Merge branch 'master' of https://github.com/sturmE/raytracer

Conflicts:
	src/geometryObjects.cpp
	src/raytracer.cpp