merge2 (incomplete)

stdafx.h

@@ -77,6 +77,9 @@
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
+#include <glm/gtc/epsilon.hpp>
+#include <glm/gtx/rotate_vector.hpp>
+#include <glm/gtx/norm.hpp>
 
 #include "openglmatrixstack.h"
 #define STRINGIZE_DETAIL(x) #x