We're using freeglut now.
Fixed merge issues. We're using freeglut now