diff --git a/README.md b/README.md
index a4514ea..c0985ef 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # 01_ME3255_repo
 
 # Answer to Homework Question
@@ -54,3 +55,56 @@ saveas(h,'figure_02.png')
 ```
 
 #Problem 5 (Velocity and Acceleration)
+=======
+# 01_ME3255_repo
+
+# Answer to Homework Question
+I hope to learn how to perform MATLAB functions more easily.
+
+#Problem 3
+```MATLAB
+A_66=zeros(6:6);
+for i=1:6;
+    j=1:6;
+    A_66(i,j)=i*j;
+end
+fprintf('mean of A_66 = %1.2f\nstdev of A_66 = %1.2f\n',mean(A_66(:)),std(A_66(:)))
+```
+Outputs:
+
+mean of A_66 = 12.25
+
+stdev of A_66 = 9.07
+
+#Problem 4
+```MATLAB
+data=dlmread('US_energy_by_sector.csv',',',2,0);
+h=figure();
+plot(data(:,1),data(:,3),data(:,1),data(:,9));
+%plotting residential energy consumption and transportational energy  
+%consumption from 1949 to 2016 in trillions of BTUs
+set(0, 'defaultAxesFontSize', 16)
+set(0,'defaultTextFontSize',14)
+set(0,'defaultLineLineWidth',3)
+set(gcf, 'Position', [200, 200, 1000, 800])
+xlabel('Time (years)')
+ylabel('Total Energy Consumed (trillions of BTUs)')
+legend('Residential','Transportation','Location','northwest')
+title('US Energy Consumption from 1949 to 2016')
+saveas(h,'figure_01.png')
+
+rescum=cumsum(data(:,3))./1000000;%cumulative sum of residential energy 
+%consumption in quintillions of BTUs
+transcum=cumsum(data(:,9))./1000000;%cumulative sum of transportational 
+%energy consumption in quintillions of BTUs
+h=figure();
+plot(data(:,1),rescum,data(:,1),transcum)
+set(gcf, 'Position', [500, 200, 1000, 800])
+xlabel('Time (years)')
+ylabel('Total Energy Consumed (quintillions of BTUs)')
+legend('Residential','Transportation','Location','northwest')
+title('Cumulative US Energy Consumption from 1949 to 2016')
+saveas(h,'figure_02.png')
+```
+#Problem 5 (Velocity and Acceleration)
+>>>>>>> 91d61e3e4b17400ee1c842feddcb5f3ad25e1994
diff --git a/US_energy_by_sector_code.m b/US_energy_by_sector_code.m
index 7ce7c8b..5ce4c32 100644
--- a/US_energy_by_sector_code.m
+++ b/US_energy_by_sector_code.m
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 data=dlmread('US_energy_by_sector.csv',',',2,0);
 figure(1)
 plot(data(:,1),data(:,3),data(:,1),data(:,9));
@@ -22,3 +23,29 @@ xlabel('Time (years)')
 ylabel('Total Energy Consumed (quintillions of BTUs)')
 legend('Residential','Transportation','Location','northwest')
 title('Cumulative US Energy Consumption from 1949 to 2016')
+=======
+data=dlmread('US_energy_by_sector.csv',',',2,0);
+figure(1)
+plot(data(:,1),data(:,3),data(:,1),data(:,9));
+set(0, 'defaultAxesFontSize', 16)
+set(0,'defaultTextFontSize',14)
+set(0,'defaultLineLineWidth',3)
+set(gcf, 'Position', [200, 200, 1000, 800])
+xlabel('Time (years)')
+ylabel('Total Energy Consumed (trillions of BTUs)')
+legend('Residential','Transportation','Location','northwest')
+title('US Energy Consumption from 1949 to 2016')
+
+
+rescum=cumsum(data(:,3))./1000000;%cumulative sum of residential energy
+%consumption in quintillions
+transcum=cumsum(data(:,9))./1000000;%cumulative sum of transportational
+%energy consumption in quintillions
+figure(2)
+plot(data(:,1),rescum,data(:,1),transcum)
+set(gcf, 'Position', [500, 200, 1000, 800])
+xlabel('Time (years)')
+ylabel('Total Energy Consumed (quintillions of BTUs)')
+legend('Residential','Transportation','Location','northwest')
+title('Cumulative US Energy Consumption from 1949 to 2016')
+>>>>>>> 91d61e3e4b17400ee1c842feddcb5f3ad25e1994