modified collision detection, fixed .obj loader, added two new models