diff --git a/cw 9/Debug/grk-cw9.exe.recipe b/cw 9/Debug/grk-cw9.exe.recipe
index 1a94e28..341dfd9 100644
--- a/cw 9/Debug/grk-cw9.exe.recipe	
+++ b/cw 9/Debug/grk-cw9.exe.recipe	
@@ -2,8 +2,12 @@
 <Project>
   <ProjectOutputs>
     <ProjectOutput>
+<<<<<<< HEAD
 <<<<<<< HEAD
       <FullPath>C:\Users\Serhii\source\repos\GRK_game_scene\Debug\grk-cw9.exe</FullPath>
+=======
+      <FullPath>C:\Users\s452624\source\repos\GRK_game_scene\Debug\grk-cw9.exe</FullPath>
+>>>>>>> fe27b7a6ee33979a4733f926c1daa46a205595a2
 =======
       <FullPath>C:\Users\s452624\source\repos\GRK_game_scene\Debug\grk-cw9.exe</FullPath>
 >>>>>>> fe27b7a6ee33979a4733f926c1daa46a205595a2
diff --git a/cw 9/Debug/grk-cw9.log b/cw 9/Debug/grk-cw9.log
index f37c3db..3ea18ec 100644
--- a/cw 9/Debug/grk-cw9.log	
+++ b/cw 9/Debug/grk-cw9.log	
@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
   main.cpp
 C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared\minwindef.h(130,1): warning C4005: 'APIENTRY': macro redefinition
 C:\Users\Serhii\source\repos\GRK_game_scene\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : see previous definition of 'APIENTRY'
@@ -10,6 +11,8 @@ C:\Users\Serhii\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(390,20): warning
 C:\Users\Serhii\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(420,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
 C:\Users\Serhii\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(434,98): warning C4305: 'argument': truncation from 'double' to 'T'
 =======
+=======
+>>>>>>> fe27b7a6ee33979a4733f926c1daa46a205595a2
   Box.cpp
   Camera.cpp
   Laser.cpp
@@ -23,21 +26,29 @@ C:\Users\s452624\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(270,20): warnin
 C:\Users\s452624\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(345,20): warning C4018: "<": niezgodność typu ze znakiem/bez znaku
 C:\Users\s452624\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(375,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
 C:\Users\s452624\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(389,98): warning C4305: "argument": obcięcie z "double" do "T"
+<<<<<<< HEAD
+>>>>>>> fe27b7a6ee33979a4733f926c1daa46a205595a2
+=======
 >>>>>>> fe27b7a6ee33979a4733f926c1daa46a205595a2
           with
           [
               T=float
           ]
 <<<<<<< HEAD
+<<<<<<< HEAD
 C:\Users\Serhii\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(437,68): warning C4305: 'argument': truncation from 'double' to 'T'
 =======
 C:\Users\s452624\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(392,68): warning C4305: "argument": obcięcie z "double" do "T"
+>>>>>>> fe27b7a6ee33979a4733f926c1daa46a205595a2
+=======
+C:\Users\s452624\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(392,68): warning C4305: "argument": obcięcie z "double" do "T"
 >>>>>>> fe27b7a6ee33979a4733f926c1daa46a205595a2
           with
           [
               T=float
           ]
 <<<<<<< HEAD
+<<<<<<< HEAD
 C:\Users\Serhii\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(475,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
 C:\Users\Serhii\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(507,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
 C:\Users\Serhii\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(536,80): warning C4305: 'argument': truncation from 'double' to 'float'
@@ -46,6 +57,8 @@ C:\Users\Serhii\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(568,80): warning
 C:\Users\Serhii\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(631,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
 C:\Users\Serhii\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(642,108): warning C4305: 'argument': truncation from 'double' to 'T'
 =======
+=======
+>>>>>>> fe27b7a6ee33979a4733f926c1daa46a205595a2
 C:\Users\s452624\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(430,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
 C:\Users\s452624\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(462,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
 C:\Users\s452624\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(491,80): warning C4305: "argument": obcięcie z "double" do "float"
@@ -53,32 +66,45 @@ C:\Users\s452624\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(500,80): warnin
 C:\Users\s452624\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(523,80): warning C4305: "argument": obcięcie z "double" do "float"
 C:\Users\s452624\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(586,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
 C:\Users\s452624\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(597,108): warning C4305: "argument": obcięcie z "double" do "T"
+<<<<<<< HEAD
+>>>>>>> fe27b7a6ee33979a4733f926c1daa46a205595a2
+=======
 >>>>>>> fe27b7a6ee33979a4733f926c1daa46a205595a2
           with
           [
               T=float
           ]
 <<<<<<< HEAD
+<<<<<<< HEAD
 C:\Users\Serhii\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(650,87): warning C4305: 'argument': truncation from 'double' to 'T'
 =======
 C:\Users\s452624\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(605,87): warning C4305: "argument": obcięcie z "double" do "T"
+>>>>>>> fe27b7a6ee33979a4733f926c1daa46a205595a2
+=======
+C:\Users\s452624\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(605,87): warning C4305: "argument": obcięcie z "double" do "T"
 >>>>>>> fe27b7a6ee33979a4733f926c1daa46a205595a2
           with
           [
               T=float
           ]
 <<<<<<< HEAD
+<<<<<<< HEAD
 C:\Users\Serhii\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(650,223): warning C4305: 'argument': truncation from 'double' to 'float'
 C:\Users\Serhii\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(653,59): warning C4305: 'argument': truncation from 'double' to 'T'
 =======
 C:\Users\s452624\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(605,223): warning C4305: "argument": obcięcie z "double" do "float"
 C:\Users\s452624\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(608,59): warning C4305: "argument": obcięcie z "double" do "T"
+>>>>>>> fe27b7a6ee33979a4733f926c1daa46a205595a2
+=======
+C:\Users\s452624\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(605,223): warning C4305: "argument": obcięcie z "double" do "float"
+C:\Users\s452624\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(608,59): warning C4305: "argument": obcięcie z "double" do "T"
 >>>>>>> fe27b7a6ee33979a4733f926c1daa46a205595a2
           with
           [
               T=float
           ]
 <<<<<<< HEAD
+<<<<<<< HEAD
 C:\Users\Serhii\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(654,37): warning C4305: 'argument': truncation from 'double' to 'float'
 C:\Users\Serhii\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(708,20): warning C4018: '<': signed/unsigned mismatch
 C:\Users\Serhii\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(713,50): warning C4305: 'argument': truncation from 'double' to 'float'
@@ -101,6 +127,8 @@ Box.obj : warning LNK4075: ignoring '/EDITANDCONTINUE' due to '/INCREMENTAL:NO'
 LINK : warning LNK4098: defaultlib 'MSVCRT' conflicts with use of other libs; use /NODEFAULTLIB:library
   grk-cw9.vcxproj -> C:\Users\Serhii\source\repos\GRK_game_scene\Debug\grk-cw9.exe
 =======
+=======
+>>>>>>> fe27b7a6ee33979a4733f926c1daa46a205595a2
 C:\Users\s452624\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(609,37): warning C4305: "argument": obcięcie z "double" do "float"
 C:\Users\s452624\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(683,20): warning C4018: "<": niezgodność typu ze znakiem/bez znaku
 C:\Users\s452624\source\repos\GRK_game_scene\cw 9\src\ex_9_1.hpp(688,50): warning C4305: "argument": obcięcie z "double" do "float"
@@ -158,4 +186,7 @@ C:\Users\s452624\source\repos\GRK_game_scene\cw 9\src\SOIL\stbi_DDS_aug_c.h(498,
 Box.obj : warning LNK4075: zignorowano opcję „/EDITANDCONTINUE” z powodu określenia opcji „/INCREMENTAL:NO”
 LINK : warning LNK4098: domyślna biblioteka „MSVCRT” powoduje konflikt z innymi bibliotekami; użyj opcji /NODEFAULTLIB:biblioteka
   grk-cw9.vcxproj -> C:\Users\s452624\source\repos\GRK_game_scene\Debug\grk-cw9.exe
+<<<<<<< HEAD
+>>>>>>> fe27b7a6ee33979a4733f926c1daa46a205595a2
+=======
 >>>>>>> fe27b7a6ee33979a4733f926c1daa46a205595a2