bump and spec maps not working yet
Merge branch 'master' of github.com:DrinQ/3D2Project

Conflicts:
	3D_II_Lab01/Debug/Light.obj
	3D_II_Lab01/Debug/ObjLoader.obj
	3D_II_Lab01/Debug/Object3D.obj
	3D_II_Lab01/Debug/Scene.obj
	3D_II_Lab01/Debug/ShaderHandler.obj
	3D_II_Lab01/Debug/main.obj
	3D_II_Lab01/Object3D.cpp