diff --git a/BasicImages/BasicImages.pde b/BasicImages/BasicImages.pde
index 8b13789..9b3752e 100644
--- a/BasicImages/BasicImages.pde
+++ b/BasicImages/BasicImages.pde
@@ -1 +1,35 @@
+<<<<<<< HEAD
+float scalefactor = .1;
+PImage Goku;
 
+
+void setup () {
+  size(800, 600);
+  Goku = loadImage("Goku.JPG");
+  
+
+}
+
+void draw () {
+  background(255);
+  image(Goku, mouseX, mouseY, Goku.width*scalefactor, Goku.height*scalefactor);
+  
+=======
+PImage Goku;
+float scalefactor = 0.1;
+
+void setup () {
+  size(600,600);
+  Goku = loadImage("Goku.JPG");
+  
+  
+}
+
+
+void draw () {
+  image(Goku, mouseX, mouseY, Goku.width*scalefactor, Goku.height*scalefactor);
+  
+  
+  
+>>>>>>> refs/remotes/origin/Filtering-Images
+}
\ No newline at end of file
diff --git a/BasicImages/data/Goku.JPG b/BasicImages/data/Goku.JPG
new file mode 100644
index 0000000..21862e2
Binary files /dev/null and b/BasicImages/data/Goku.JPG differ
diff --git a/FilteringImages/FilteringImages.pde b/FilteringImages/FilteringImages.pde
index 8b13789..a3e4aa5 100644
--- a/FilteringImages/FilteringImages.pde
+++ b/FilteringImages/FilteringImages.pde
@@ -1 +1,34 @@
+<<<<<<< HEAD
+float scalefactor = .1;
+PImage Goku;
 
+
+void setup () {
+  size(800, 600);
+  Goku = loadImage("Goku.JPG");
+  
+
+}
+
+void draw () {
+  image(Goku, mouseX, mouseY, Goku.width*scalefactor, Goku.height*scalefactor);
+  filter(INVERT);
+=======
+PImage Goku;
+float scalefactor = 0.1;
+
+void setup () {
+  size(600,600);
+  Goku = loadImage("Goku.JPG");
+  
+  
+}
+
+
+void draw () {
+  image(Goku, mouseX, mouseY, Goku.width*scalefactor, Goku.height*scalefactor);
+  filter(INVERT);
+  
+  
+>>>>>>> refs/remotes/origin/Filtering-Images
+}
\ No newline at end of file
diff --git a/FilteringImages/data/Goku.JPG b/FilteringImages/data/Goku.JPG
new file mode 100644
index 0000000..21862e2
Binary files /dev/null and b/FilteringImages/data/Goku.JPG differ
diff --git a/IndependentImagePractice/IndependentImagePractice.pde b/IndependentImagePractice/IndependentImagePractice.pde
index 8b13789..b2a9c34 100644
--- a/IndependentImagePractice/IndependentImagePractice.pde
+++ b/IndependentImagePractice/IndependentImagePractice.pde
@@ -1 +1,29 @@
+//declare image variables
 
+PImage gsw;
+PImage light;
+
+void setup () {
+  size(800, 800);  //set canvas
+
+  gsw = loadImage("gsw.jpg");
+  light = loadImage("2lightning.jpg");
+  gsw.blend(light, 0, 0, 800, 800, 0, 0, 800, 800, SUBTRACT);  //blend the two images together
+
+  gsw = loadImage("gsw.jpg");  //load the Warriors logo 
+  light = loadImage("2lightning.jpg");  //load the lightning image
+  gsw.blend(light, 0, 0, 800, 800, 0, 0, 800, 800, SUBTRACT);  //blend the two pics together
+
+}
+
+
+
+void draw () {
+  image(gsw, 0, 0);
+
+  tint(50, 235, 255);  //give the masked images a blue tint
+  if (mousePressed) {  //while mouse is pressed, randomly change tint
+
+    tint(random(255), random(255), random(255));
+  }
+}
\ No newline at end of file
diff --git a/IndependentImagePractice/data/2lightning.jpg b/IndependentImagePractice/data/2lightning.jpg
new file mode 100644
index 0000000..02a7ce3
Binary files /dev/null and b/IndependentImagePractice/data/2lightning.jpg differ
diff --git a/IndependentImagePractice/data/gsw.jpg b/IndependentImagePractice/data/gsw.jpg
new file mode 100644
index 0000000..86a68e9
Binary files /dev/null and b/IndependentImagePractice/data/gsw.jpg differ
diff --git a/IndependentImagePractice/data/lightning.jpg b/IndependentImagePractice/data/lightning.jpg
new file mode 100644
index 0000000..01a02aa
Binary files /dev/null and b/IndependentImagePractice/data/lightning.jpg differ
diff --git a/MaskingImages/MaskingImages.pde b/MaskingImages/MaskingImages.pde
index 8b13789..e679b24 100644
--- a/MaskingImages/MaskingImages.pde
+++ b/MaskingImages/MaskingImages.pde
@@ -1 +1,17 @@
+PImage gokukamehameha;
+PImage gohancellkamehameha;
 
+void setup () {
+  size(600,600);
+  gokukamehameha = loadImage("gokukamehameha.png");
+  gohancellkamehameha = loadImage("gohancellkamehameha.gif");
+  gohancellkamehameha.mask(gokukamehameha);
+  gokukamehameha.mask(gohancellkamehameha);
+}
+
+void draw () {
+  background (map(mouseY, 0, height, 0, 255));
+  image(gokukamehameha, 0, 0);
+  image(gohancellkamehameha, 0, 0);
+  
+}
\ No newline at end of file
diff --git a/MaskingImages/data/SSJgodGOKU.jpg b/MaskingImages/data/SSJgodGOKU.jpg
new file mode 100644
index 0000000..cac26c6
Binary files /dev/null and b/MaskingImages/data/SSJgodGOKU.jpg differ
diff --git a/MaskingImages/data/SSJgodVEGETA.jpg b/MaskingImages/data/SSJgodVEGETA.jpg
new file mode 100644
index 0000000..ffb5b24
Binary files /dev/null and b/MaskingImages/data/SSJgodVEGETA.jpg differ
diff --git a/MaskingImages/data/gohan cell kamehameha.gif b/MaskingImages/data/gohan cell kamehameha.gif
new file mode 100644
index 0000000..47e18ef
Binary files /dev/null and b/MaskingImages/data/gohan cell kamehameha.gif differ
diff --git a/MaskingImages/data/gohancellkamehameha.gif b/MaskingImages/data/gohancellkamehameha.gif
new file mode 100644
index 0000000..f1470c6
Binary files /dev/null and b/MaskingImages/data/gohancellkamehameha.gif differ
diff --git a/MaskingImages/data/goku kamehameha.png b/MaskingImages/data/goku kamehameha.png
new file mode 100644
index 0000000..c2ab61d
Binary files /dev/null and b/MaskingImages/data/goku kamehameha.png differ
diff --git a/MaskingImages/data/gokukamehameha.png b/MaskingImages/data/gokukamehameha.png
new file mode 100644
index 0000000..665cc8a
Binary files /dev/null and b/MaskingImages/data/gokukamehameha.png differ