premerge commit
Merged with Paul's stuff
removed dependencies on libjpeg for the moment as my machine doesnt have the libraries installed and we arent using it anyway
removed dependencies on libjpeg for the moment as my machine doesnt have the libraries installed and we arent using it anyway
added glm
merged and added glm
merged and added glm
merged and added glm
WoooHooo we have a flaccid snake