Corrected conflicts after merge

After merging my branch into master, I had to take out a few things that
was added by git. Also, had to go back to using my GraphicsMesh class. I
left the OBJ classes in, but we can load in a mesh and render it with a
color texture in asset mode.