Modified matrix.cpp and Scene.cpp to use glm/glm instead of glm/