Merge branch 'developer' into feature/Menu

# Conflicts:
#	CrystalPoint.vcxproj.filters
#	Main.cpp
#	Skybox.cpp
#	Skybox.h

Skybox.h

@@ -6,10 +6,16 @@ class Skybox
 private:
 	float size;
 	std::string folder;
+	float brightness;
+	float targetBrightness;
 public:
 	Skybox(const float &size, const std::string &folder);
 	~Skybox();
 
 	void init();
 	void draw();
+
+	void update(float deltaTime, int, int);
+	GLuint loadTexture(const std::string &fileName);
+
 };