refactoring so I can merge
Merge branch 'master'
just fix somethings
Merge branch 'master' of https://github.com/JLmike7/Senior-Design.git
fixing things up
Merge pull request #17 from JLmike7/JLmike7

Implemented point, triangle, quad, and box classes.
Created a graphical view
Merge branch 'master' of https://github.com/JLmike7/Senior-Design.git
Added some unit test framework
Merge commit
replacing 'person' with 'biped'
Merge branch 'master' of https://github.com/JLmike7/Senior-Design.git
Adding all of the textures
some fixes to World class
Merge branch 'master' of https://github.com/JLmike7/Senior-Design.git
Merge branch 'master' of https://github.com/JLmike7/Senior-Design.git
Added more unit tests
merge
Biped, Stats, Weapon unit tests in place, fixed errors in other new unit tests.  Comments still need to be changed.
Merge fix