Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL

includes/learnopengl/shader_s.h

@@ -66,7 +66,7 @@ public:
         glAttachShader(ID, fragment);
         glLinkProgram(ID);
         checkCompileErrors(ID, "PROGRAM");
-        // delete the shaders as they're linked into our program now and no longer necessery
+        // delete the shaders as they're linked into our program now and no longer necessary
         glDeleteShader(vertex);
         glDeleteShader(fragment);
     }

src/1.getting_started/3.3.shaders_class/shaders_class.cpp

@@ -39,7 +39,7 @@ int main()
     }
 
 
-    // build and compile our shader zprogram
+    // build and compile our shader program
     // ------------------------------------
     Shader ourShader("3.3.shader.vs", "3.3.shader.fs"); // you can name your shader files however you like