Added ability to include arbitrary textures to the renderer's load
Merge branch 'master' of https://github.com/alexsapps/cse125
Crosshairs, yo
Merge branch 'master' of https://github.com/alexsapps/cse125