Sky Box a funcionar, mas com o Bottom a esmerdarsse!
Merge remote-tracking branch 'origin/SkyBox'

Conflicts:
	CG_FPS_project/build-CG_FPS_project-Desktop_Qt_5_2_1_MinGW_32bit-Debug/Test/Camo1/Camo-Wallpaper.bmp
	CG_FPS_project/build-CG_FPS_project-Desktop_Qt_5_2_1_MinGW_32bit-Debug/Test/Camo1/camo.mtl
	CG_FPS_project/build-CG_FPS_project-Desktop_Qt_5_2_1_MinGW_32bit-Debug/Test/Camo1/camo1.mtl
	CG_FPS_project/build-CG_FPS_project-Desktop_Qt_5_2_1_MinGW_32bit-Debug/Test/Camo2/Camo-Wallpaper-Picture.bmp
	CG_FPS_project/build-CG_FPS_project-Desktop_Qt_5_2_1_MinGW_32bit-Debug/Test/Camo2/camo.mtl
	CG_FPS_project/build-CG_FPS_project-Desktop_Qt_5_2_1_MinGW_32bit-Debug/Test/Camo2/camo2.mtl
	CG_FPS_project/build-CG_FPS_project-Desktop_Qt_5_2_1_MinGW_32bit-Debug/Test/Camo3/camo.mtl
	CG_FPS_project/build-CG_FPS_project-Desktop_Qt_5_2_1_MinGW_32bit-Debug/Test/Camo3/camo3.mtl
	CG_FPS_project/build-CG_FPS_project-Desktop_Qt_5_2_1_MinGW_32bit-Debug/Test/Wall/Wall.mtl
	CG_FPS_project/build-CG_FPS_project-Desktop_Qt_5_3_0_MinGW_32bit-Debug/Test/Camo1/camo1.mtl
	CG_FPS_project/build-CG_FPS_project-Desktop_Qt_5_3_0_MinGW_32bit-Debug/Test/Camo2/camo2.mtl
	CG_FPS_project/build-CG_FPS_project-Desktop_Qt_5_3_0_MinGW_32bit-Debug/Test/Camo3/camo.mtl