got textures in jpg format, started working on game logic.
Merge branch 'master' of https://github.com/palmerlao/CS452-PROJECT2

Conflicts:
	src/test/shapes_tester.cpp
	src/test/triprism.h
starting migrating game logic code into shape_tester.cpp
added files, forgot