Merge branch 'feature' into 'master'

Feature

See merge request !2

.gitlab/merge_request_templates/default.md

+# Description
+
+Describe your changes
+
+# Checklist
+[ ] Tests pass
+[ ] I checked the coding guidelines

src/funcs.cpp

@@ -2,6 +2,7 @@
 using namespace std;
 
 int add(int a,int b){return a+b;}
+int add2(int a,int b){return a+b+2;}
 int sub(int a,int b){return a-b;}
 int mul(int a,int b){return a*b;}
 int  dv(int a,int b){

tests/test_funcs.cpp

@@ -4,6 +4,9 @@
 TEST(FuncsTest,Add){
  EXPECT_EQ(6,add(4,2));
 };
+TEST(FuncsTest,Add2){
+ EXPECT_EQ(8,add2(4,2));
+};
 TEST(FuncsTest,Sub){
  EXPECT_EQ(2,sub(4,2));
 };