loading correct obj file
added skybox
added skybox and fixed conflicts