Merge remote-tracking branch 'origin/master'

Conflicts:
	Ex1/Framework/Backup/RayTracer.sln
	Ex1/Framework/Config.xml
	Ex1/Framework/Image1_2.png
	Ex1/Framework/Image1_3.png
	Ex1/Framework/Image1_4_1.png
	Ex1/Framework/Image1_4_2.png
	Ex1/Framework/RayTracer.cpp
	Ex1/Framework/RayTracer.sln
	Ex1/Framework/RayTracer.v11.suo
	Ex1/Framework/RayTracer.vcproj
	Ex1/Framework/RayTracer.vcxproj
	Ex1/Framework/Renderer.cpp
	Ex1/Framework/Renderer.h
	Ex1/Framework/Scene.cpp
	Ex1/Framework/Scene.h
	Ex1/Framework/UpgradeLog.XML
	Ex1/Framework/UpgradeLog.htm
	Ex1/Framework/_UpgradeReport_Files/UpgradeReport.css
	Ex1/Framework/_UpgradeReport_Files/UpgradeReport.xslt
	Ex1/Framework/_UpgradeReport_Files/UpgradeReport_Error.png
	Ex1/Framework/_UpgradeReport_Files/UpgradeReport_Information.png
	Ex1/Framework/_UpgradeReport_Files/UpgradeReport_Success.png
	Ex1/Framework/_UpgradeReport_Files/UpgradeReport_Warning.png
	Ex1/Framework/exportImage.bmp
	Ex1/Framework/exporter/Exporter.cpp
	Ex1/Framework/exporter/Exporter.h
	Ex1/Framework/include/GL/GL.h
	Ex1/Framework/include/GL/GLU.h
	Ex1/Framework/include/GL/glut.h
	Ex1/Framework/lib/OpenGL32.lib
	Ex1/Framework/lib/glut32.dll
	Ex1/Framework/lib/glut32.lib
	Ex1/Framework/parser/ConfigParser.cpp
	Ex1/Framework/parser/ConfigParser.h
	Ex1/Framework/parser/SceneParser.cpp
	Ex1/Framework/parser/SceneParser.h
	Ex1/Framework/parser/SimpleXMLNode.cpp
	Ex1/Framework/parser/SimpleXMLNode.h
	Ex1/Framework/remove-compiled.bat
	Ex1/Framework/rendererelements/ISampler.h
	Ex1/Framework/rendererelements/IntersectionData.cpp
	Ex1/Framework/rendererelements/IntersectionData.h
	Ex1/Framework/rendererelements/ProgressiveSampler.cpp
	Ex1/Framework/rendererelements/ProgressiveSampler.h
	Ex1/Framework/rendererelements/Sample.cpp
	Ex1/Framework/rendererelements/Sample.h
	Ex1/Framework/rendererelements/ScanlineSampler.cpp
	Ex1/Framework/rendererelements/ScanlineSampler.h
	Ex1/Framework/rendererelements/Shader/ConstantShader.cpp
	Ex1/Framework/rendererelements/Shader/ConstantShader.h
	Ex1/Framework/rendererelements/Shader/DiffuseLightingShader.cpp
	Ex1/Framework/rendererelements/Shader/DiffuseLightingShader.h
	Ex1/Framework/rendererelements/Shader/IShader.h
	Ex1/Framework/rendererelements/Shader/PhongLightingShader.cpp
	Ex1/Framework/rendererelements/Shader/PhongLightingShader.h
	Ex1/Framework/sceneDescriptions/Scene_0.xml
	Ex1/Framework/sceneDescriptions/Scene_1.xml
	Ex1/Framework/sceneDescriptions/Scene_2.xml
	Ex1/Framework/sceneDescriptions/scenedescription_tutorial.html
	Ex1/Framework/sceneelements/ICamera.h
	Ex1/Framework/sceneelements/IElement.cpp
	Ex1/Framework/sceneelements/IElement.h
	Ex1/Framework/sceneelements/ILight.h
	Ex1/Framework/sceneelements/PointLight.cpp
	Ex1/Framework/sceneelements/PointLight.h
	Ex1/Framework/sceneelements/SimpleCamera.cpp
	Ex1/Framework/sceneelements/SimpleCamera.h
	Ex1/Framework/sceneelements/geometry/CirclePlane.cpp
	Ex1/Framework/sceneelements/geometry/CirclePlane.h
	Ex1/Framework/sceneelements/geometry/Mesh.cpp
	Ex1/Framework/sceneelements/geometry/Mesh.h
	Ex1/Framework/sceneelements/geometry/MeshTriangle.cpp
	Ex1/Framework/sceneelements/geometry/MeshTriangle.h
	Ex1/Framework/sceneelements/geometry/MeshVertex.cpp
	Ex1/Framework/sceneelements/geometry/MeshVertex.h
	Ex1/Framework/sceneelements/geometry/Plane.cpp
	Ex1/Framework/sceneelements/geometry/Plane.h
	Ex1/Framework/sceneelements/geometry/Quadric.cpp
	Ex1/Framework/sceneelements/geometry/Quadric.h
	Ex1/Framework/sceneelements/geometry/Sphere.cpp
	Ex1/Framework/sceneelements/geometry/Sphere.h
	Ex1/Framework/sceneelements/geometry/Torus.cpp
	Ex1/Framework/sceneelements/geometry/Torus.h
	Ex1/Framework/sceneelements/geometry/Triangle.cpp
	Ex1/Framework/sceneelements/geometry/Triangle.h
	Ex1/Framework/trianglemeshreader/OBJFileReader.cpp
	Ex1/Framework/trianglemeshreader/OBJFileReader.h
	Ex1/Framework/utils/AABB.h
	Ex1/Framework/utils/ComplexNumber.h
	Ex1/Framework/utils/IFunctionObservable.h
	Ex1/Framework/utils/Image.cpp
	Ex1/Framework/utils/Image.h
	Ex1/Framework/utils/KDTreeNode.h
	Ex1/Framework/utils/Material.h
	Ex1/Framework/utils/Matrix4.h
	Ex1/Framework/utils/Point.h
	Ex1/Framework/utils/Ray.cpp
	Ex1/Framework/utils/Ray.h
	Ex1/Framework/utils/Vector2.h
	Ex1/Framework/utils/Vector3.h
	Ex1/Framework/utils/Vector4.h
	Ex1/Framework/utils/rpoly.h
	Ex1/Framework/utils/string_conversions.h
	Ex1/Framework/utils/textures/ITexture.h
	Ex2/Framework/Backup/RayTracer.sln
	Ex2/Framework/RayTracer.cpp
	Ex2/Framework/RayTracer.sln
	Ex2/Framework/RayTracer.vcproj
	Ex2/Framework/RayTracer.vcxproj
	Ex2/Framework/Renderer.cpp
	Ex2/Framework/Renderer.h
	Ex2/Framework/Scene.cpp
	Ex2/Framework/Scene.h
	Ex2/Framework/_UpgradeReport_Files/UpgradeReport.css
	Ex2/Framework/_UpgradeReport_Files/UpgradeReport.xslt
	Ex2/Framework/_UpgradeReport_Files/UpgradeReport_Success.png
	Ex2/Framework/_UpgradeReport_Files/UpgradeReport_Warning.png
	Ex2/Framework/exporter/Exporter.cpp
	Ex2/Framework/exporter/Exporter.h
	Ex2/Framework/include/GL/GL.h
	Ex2/Framework/include/GL/GLU.h
	Ex2/Framework/include/GL/glut.h
	Ex2/Framework/lib/OpenGL32.lib
	Ex2/Framework/lib/glut32.dll
	Ex2/Framework/lib/glut32.lib
	Ex2/Framework/parser/SceneParser.cpp
	Ex2/Framework/parser/SceneParser.h
	Ex2/Framework/parser/SimpleXMLNode.cpp
	Ex2/Framework/parser/SimpleXMLNode.h
	Ex2/Framework/remove-compiled.bat
	Ex2/Framework/rendererelements/ISampler.h
	Ex2/Framework/rendererelements/IntersectionData.cpp
	Ex2/Framework/rendererelements/IntersectionData.h
	Ex2/Framework/rendererelements/ProgressiveSampler.cpp
	Ex2/Framework/rendererelements/ProgressiveSampler.h
	Ex2/Framework/rendererelements/Sample.cpp
	Ex2/Framework/rendererelements/Sample.h
	Ex2/Framework/rendererelements/ScanlineSampler.cpp
	Ex2/Framework/rendererelements/ScanlineSampler.h
	Ex2/Framework/rendererelements/Shader/IShader.h
	Ex2/Framework/rendererelements/Shader/PhongLightingShader.cpp
	Ex2/Framework/rendererelements/Shader/PhongLightingShader.h
	Ex2/Framework/sceneDescriptions/scenedescription_tutorial.html
	Ex2/Framework/sceneelements/ICamera.h
	Ex2/Framework/sceneelements/IElement.cpp
	Ex2/Framework/sceneelements/IElement.h
	Ex2/Framework/sceneelements/ILight.h
	Ex2/Framework/sceneelements/PointLight.cpp
	Ex2/Framework/sceneelements/PointLight.h
	Ex2/Framework/sceneelements/SimpleCamera.cpp
	Ex2/Framework/sceneelements/SimpleCamera.h
	Ex2/Framework/sceneelements/geometry/Mesh.h
	Ex2/Framework/sceneelements/geometry/MeshTriangle.h
	Ex2/Framework/sceneelements/geometry/MeshVertex.cpp
	Ex2/Framework/sceneelements/geometry/MeshVertex.h
	Ex2/Framework/sceneelements/geometry/Plane.cpp
	Ex2/Framework/sceneelements/geometry/Plane.h
	Ex2/Framework/sceneelements/geometry/Quadric.cpp
	Ex2/Framework/sceneelements/geometry/Quadric.h
	Ex2/Framework/sceneelements/geometry/Sphere.cpp
	Ex2/Framework/sceneelements/geometry/Sphere.h
	Ex2/Framework/sceneelements/geometry/Torus.cpp
	Ex2/Framework/sceneelements/geometry/Torus.h
	Ex2/Framework/sceneelements/geometry/Triangle.cpp
	Ex2/Framework/sceneelements/geometry/Triangle.h
	Ex2/Framework/trianglemeshreader/OBJFileReader.cpp
	Ex2/Framework/trianglemeshreader/OBJFileReader.h
	Ex2/Framework/utils/IFunctionObservable.h
	Ex2/Framework/utils/Image.cpp
	Ex2/Framework/utils/Image.h
	Ex2/Framework/utils/KDTreeNode.h
	Ex2/Framework/utils/Material.h
	Ex2/Framework/utils/Matrix4.h
	Ex2/Framework/utils/Point.h
	Ex2/Framework/utils/Ray.cpp
	Ex2/Framework/utils/Ray.h
	Ex2/Framework/utils/Vector2.h
	Ex2/Framework/utils/Vector3.h
	Ex2/Framework/utils/Vector4.h
	Ex2/Framework/utils/rpoly.h
	Ex2/Framework/utils/string_conversions.h
	Ex2/Framework/utils/textures/ITexture.h
	Exercices/Framework/Backup/RayTracer.sln
	Exercices/Framework/RayTracer.cpp
	Exercices/Framework/RayTracer.sln
	Exercices/Framework/RayTracer.vcproj
	Exercices/Framework/RayTracer.vcxproj
	Exercices/Framework/Renderer.cpp
	Exercices/Framework/Renderer.h
	Exercices/Framework/Scene.cpp
	Exercices/Framework/Scene.h
	Exercices/Framework/_UpgradeReport_Files/UpgradeReport.css
	Exercices/Framework/_UpgradeReport_Files/UpgradeReport.xslt
	Exercices/Framework/_UpgradeReport_Files/UpgradeReport_Success.png
	Exercices/Framework/_UpgradeReport_Files/UpgradeReport_Warning.png
	Exercices/Framework/exporter/Exporter.cpp
	Exercices/Framework/exporter/Exporter.h
	Exercices/Framework/include/GL/GL.h
	Exercices/Framework/include/GL/GLU.h
	Exercices/Framework/include/GL/glut.h
	Exercices/Framework/lib/OpenGL32.lib
	Exercices/Framework/lib/glut32.dll
	Exercices/Framework/lib/glut32.lib
	Exercices/Framework/parser/SceneParser.cpp
	Exercices/Framework/parser/SceneParser.h
	Exercices/Framework/parser/SimpleXMLNode.cpp
	Exercices/Framework/parser/SimpleXMLNode.h
	Exercices/Framework/remove-compiled.bat
	Exercices/Framework/rendererelements/ISampler.h
	Exercices/Framework/rendererelements/IntersectionData.cpp
	Exercices/Framework/rendererelements/IntersectionData.h
	Exercices/Framework/rendererelements/ProgressiveSampler.cpp
	Exercices/Framework/rendererelements/ProgressiveSampler.h
	Exercices/Framework/rendererelements/Sample.cpp
	Exercices/Framework/rendererelements/Sample.h
	Exercices/Framework/rendererelements/ScanlineSampler.cpp
	Exercices/Framework/rendererelements/ScanlineSampler.h
	Exercices/Framework/rendererelements/Shader/IShader.h
	Exercices/Framework/rendererelements/Shader/PhongLightingShader.cpp
	Exercices/Framework/rendererelements/Shader/PhongLightingShader.h
	Exercices/Framework/sceneDescriptions/scenedescription_tutorial.html
	Exercices/Framework/sceneelements/ICamera.h
	Exercices/Framework/sceneelements/IElement.cpp
	Exercices/Framework/sceneelements/IElement.h
	Exercices/Framework/sceneelements/ILight.h
	Exercices/Framework/sceneelements/PointLight.cpp
	Exercices/Framework/sceneelements/PointLight.h
	Exercices/Framework/sceneelements/SimpleCamera.cpp
	Exercices/Framework/sceneelements/SimpleCamera.h
	Exercices/Framework/sceneelements/geometry/Mesh.h
	Exercices/Framework/sceneelements/geometry/MeshTriangle.h
	Exercices/Framework/sceneelements/geometry/MeshVertex.cpp
	Exercices/Framework/sceneelements/geometry/MeshVertex.h
	Exercices/Framework/sceneelements/geometry/Plane.cpp
	Exercices/Framework/sceneelements/geometry/Plane.h
	Exercices/Framework/sceneelements/geometry/Quadric.cpp
	Exercices/Framework/sceneelements/geometry/Quadric.h
	Exercices/Framework/sceneelements/geometry/Sphere.cpp
	Exercices/Framework/sceneelements/geometry/Sphere.h
	Exercices/Framework/sceneelements/geometry/Torus.cpp
	Exercices/Framework/sceneelements/geometry/Torus.h
	Exercices/Framework/sceneelements/geometry/Triangle.cpp
	Exercices/Framework/sceneelements/geometry/Triangle.h
	Exercices/Framework/trianglemeshreader/OBJFileReader.cpp
	Exercices/Framework/trianglemeshreader/OBJFileReader.h
	Exercices/Framework/utils/IFunctionObservable.h
	Exercices/Framework/utils/Image.cpp
	Exercices/Framework/utils/Image.h
	Exercices/Framework/utils/KDTreeNode.h
	Exercices/Framework/utils/Material.h
	Exercices/Framework/utils/Matrix4.h
	Exercices/Framework/utils/Point.h
	Exercices/Framework/utils/Ray.cpp
	Exercices/Framework/utils/Ray.h
	Exercices/Framework/utils/Vector2.h
	Exercices/Framework/utils/Vector3.h
	Exercices/Framework/utils/Vector4.h
	Exercices/Framework/utils/rpoly.h
	Exercices/Framework/utils/string_conversions.h
	Exercices/Framework/utils/textures/ITexture.h
Merge remote-tracking branch 'origin/master'

Conflicts: