mysterious changes
gone 3D! rotating pyramid

Conflicts:
	gltest/main.hpp
	src/main.cpp
added glm library to project