Merge branch 'master' of http://github.com/lucilley/3D-Maze into trees

Conflicts:
	prototype-glfw/src/Resources/Shaders/Atmosphere/SunLight.glsl
	prototype-glfw/src/Targets/BasicWindow/main.cpp
add cloudnode info
Merge branch 'cloud' of https://github.com/lucilley/Graphics-Practicum into cloud
Calling it
Merge branch 'master' of http://github.com/lucilley/3D-Maze into trees

Conflicts:
	prototype-glfw/src/Resources/Shaders/Atmosphere/SunLight.glsl
	prototype-glfw/src/Targets/BasicWindow/main.cpp
Merge branch 'master' of http://github.com/lucilley/3D-Maze into trees

Conflicts:
	prototype-glfw/src/Common/Core/Render/BasicRenderer.cpp
	prototype-glfw/src/Resources/Shaders/Atmosphere/SunLight.glsl
	prototype-glfw/src/Targets/BasicWindow/main.cpp
Changed the tree placement and generation randomization a little bit