fixed lighting position thing
merge
commented out glut stuff