Added glm header files, as we have to supply them when handing the code in. Also changed header includes.