Merge branch 'master' into 'develop'

Master

See merge request !19

firstCommit/addTwoNumbers_Lemmer.m

+function c = addTwoNumbers(a, b)
+% addTwoNumbers(a, b) returns the sum of a and b
+
+c = a + b;
+end

firstCommit/addTwoNumbers_StefaniaMagnusdottir.m

+function c = addTwoNumbers_StefaniaMagnusdottir(a, b)
+% addTwoNumbers(a, b) returns the sum of a and b
+
+c = a + b;
+end

firstCommit/addTwoNumbers_hulda.m

+function c = addTwoNumbers_hulda(a, b)
+% addTwoNumbers(a, b) returns the sum of a and b
+
+c = a + b;
+end

firstCommit/addTwoNumbers_jenn.m

+function c = addTwoNumbers(a, b)
+% addTwoNumbers(a, b) returns the sum of a and b
+
+c = a + b;
+end

firstCommit/addTwoNumbers_miguel.m

+function c = addTwoNumbers_miguel(a, b)
+% addTwoNumbers(a, b) returns the sum of a and b
+
+c = a + b;
+end

secondCommit/multiplyTwoNumbers_StefaniaMagnusdottir.m

+function c = multiplyTwoNumbers_StefaniaMagnusdottir(a, b)
+% multiplyTwoNumbers(a, b) returns the product of a and b
+
+c = a * b;
+end

secondCommit/multiplyTwoNumbers_jenn.m

+function c = multiplyTwoNumbers(a, b)
+% multiplyTwoNumbers(a, b) returns the product of a and b
+
+c = a * b;
+end

sqrt_jenn.m

+function s = sqrt_jenn(a)
+s = sqrt(a);
+end

test_jenn.m

+% Test file
+
+addpath(genpath(pwd))  % add this folder and all subfolders to the path
+
+c = addTwoNumbers_jenn(1, 1);  % 1 + 1
+
+d = multiplyTwoNumbers_jenn(c, c);  % 2 * 2 
+
+% test my sqrt function
+assert(sqrt_jenn(d) == sqrt(d))