test
reset to last one
Merge branch 'master' of https://github.com/shengxus/OpenGL
reset
Revert "Add sky"

This reverts commit 8eeb054043670407db4444cd658a89e815bb2548.

Conflicts:
	Project/Debug/Project.exe
	Project/Debug/Project.ilk
	Project/Debug/Project.pdb
	Project/Project.sdf
	Project/Project.suo
	Project/Project/Debug/CL.read.1.tlog
	Project/Project/Debug/CL.write.1.tlog
	Project/Project/Debug/Camera.obj
	Project/Project/Debug/Demo.obj
	Project/Project/Debug/Grass.obj
	Project/Project/Debug/Object.obj
	Project/Project/Debug/Project.Build.CppClean.log
	Project/Project/Debug/Project.exe.embed.manifest
	Project/Project/Debug/Project.exe.intermediate.manifest
	Project/Project/Debug/Project.lastbuildstate
	Project/Project/Debug/Project.log
	Project/Project/Debug/Project.tlog/Project.lastbuildstate
	Project/Project/Debug/Project.tlog/cl.command.1.tlog
	Project/Project/Debug/Sky.obj
	Project/Project/Debug/Terrain.obj
	Project/Project/Debug/Tree.obj
	Project/Project/Debug/cl.command.1.tlog
	Project/Project/Debug/link.command.1.tlog
	Project/Project/Debug/link.read.1.tlog
	Project/Project/Debug/link.write.1.tlog
	Project/Project/Debug/mt.command.1.tlog
	Project/Project/Debug/mt.read.1.tlog
	Project/Project/Debug/mt.write.1.tlog
	Project/Project/Debug/rc.command.1.tlog
	Project/Project/Debug/rc.read.1.tlog
	Project/Project/Debug/rc.write.1.tlog
	Project/Project/Debug/vc100.idb
	Project/Project/Debug/vc100.pdb
	Project/Project/Project.vcxproj
	Project/Project/Project.vcxproj.filters
	Project/Project/Project.vcxproj.user
	Project/Project/src/Demo.cpp
	Project/Project/src/Grass.cpp
	Project/Project/src/Object.cpp
	Project/Project/src/Sky.cpp
	Project/Project/src/Tree.cpp
	Project/Project/src/incl/Camera.cpp
	Project/Project/src/incl/Camera.h
	Project/Project/src/incl/Global.h
	Project/Project/src/incl/Object.h
	Project/Project/src/incl/Sky.h
	Project/Readme.md
	Project/ipch/project-97ba1c86/project-12eaf403.ipch
Merge branch 'master' into terrain