From 193cfe7224fe411dc045c172bc11859db7030813 Mon Sep 17 00:00:00 2001
From: dhelms1 <derek.helms4@gmail.com>
Date: Mon, 7 Feb 2022 11:39:35 -0800
Subject: [PATCH 1/6] typos fixed

---
 main.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/main.cpp b/main.cpp
index bb63cb8..6024d61 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,24 +5,24 @@ int main()
 {
   int age;
   string name;
-  char last initial;
+  char lastInitial;
 
-  cout<<"Hi. What is your first name? "
-  cin<<name;
-  cout<<"name, what is the first letter of your last name? ";
-  cin>>last initial;
-  cout<<"Thanks, "<<name<< <<last initial<<.<<endl;
+  cout<<"Hi. What is your first name? ";
+  cin>>name;
+  cout<<name<< ", what is the first letter of your last name? ";
+  cin>>lastInitial;
+  cout<<"Thanks, "<<name<<" "<<lastInitial<<.<<endl;
   cout<<"Please also tell me how old you are: ";
-  cin>>age>>endl;
+  cin>>age;
 
   if( age < 12 )
   {
     cout<<"Hey kid, how do you like school?\n";
   }
   if( age < 18 )
-    cout<<"Cool!"endl;
-    cout<<"How's highschool going?\n";
-  else( age >= 18 );
+    cout<<"Cool!"<<endl;
+    cout<<"How's highschool going?\nl;
+  else;
   {
     cout<<"Pleased to meet you!\n";
   }

From 977e7f89b3f54aa0542d206bc9a1814f8d176999 Mon Sep 17 00:00:00 2001
From: dhelms1 <derek.helms4@gmail.com>
Date: Mon, 7 Feb 2022 12:36:32 -0800
Subject: [PATCH 2/6] resolved conflicts

---
 main.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main.cpp b/main.cpp
index 6024d61..1650b11 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,6 +1,7 @@
 #include <iostream>
 using namespace std;
 
+// Changes
 int main()
 {
   int age;

From 4aa194f9e2135c7d9d683b2ea10aa4a4b335a746 Mon Sep 17 00:00:00 2001
From: dhelms1 <derek.helms4@gmail.com>
Date: Wed, 16 Feb 2022 11:45:03 -0800
Subject: [PATCH 3/6] bug fixes and actions file created

---
 .github/.DS_Store             | Bin 0 -> 6148 bytes
 .github/workflows/.DS_Store   | Bin 0 -> 6148 bytes
 .github/workflows/actions.yml |  15 +++++++++++++++
 main.cpp                      |   4 +++-
 4 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 .github/.DS_Store
 create mode 100644 .github/workflows/.DS_Store
 create mode 100644 .github/workflows/actions.yml

diff --git a/.github/.DS_Store b/.github/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..c3568241d0e5ec1883b0fff075fe325416701a03
GIT binary patch
literal 6148
zcmeHK&5qMB5FU36>l6?@AhAbZxK*e>XeACv*-{RBLkfZepxtCswh?JuH7OC4qFi|d
zcoOc215dz>x8Mvjwp;DeAngeuG$W0_@p#6rKS#9(0K{++_W;@eAW;b$9yT>X<D^^C
zaGqU6Vdi)NDQGAmKTNlx+3_zjKxgOSiD{U_OE`0W`XowqgroFn9H8F*X#}m>jHt|K
zF5_!7OOw3lcE5?nPV>^`T`60#b*=S0nCLPn!eWsR!}(L{Jq(LU<m^XUryDzr9w+1S
zsD0zU&WbR}#&eUL#A6J3_9V$-T@Ljki*qwiU<ai1q<7TbTP_Ft{f-(8`m2sw-tBig
z>ds()wesZ6TfKXS$J5tumTy<@KA6pbz>n9+b%$&Ch(--L>1i)G(bL&FtUhY0M<Yjw
z{BiZu`!C-=6OA?VO?7<1$l2r~E58cnS*o*BTy4FxGe4D0W`G%B1~z{V@(Po|3@`)C
zz;6uD<3XVk`VK3L=3Rk}DFG0h=r)2jJs2rRIrJS?7I6ec*i=NDDqM*nY&!ati}M{;
z7Hv8RS9}P!vTzlOFstMI%7laPEpp2YFazfq*s<L<-Tx2%T>qa>;vO@=4E$FNh~_95
z4RK5EZr$1(-L(q!7?p(LDvO&GG|W|uv2+#hp&CKIA_LKPSXo353O@u44cssTf0cn>
DD4>Ui

literal 0
HcmV?d00001

diff --git a/.github/workflows/.DS_Store b/.github/workflows/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..4b416b9d99e5aa82e4470f4b540f2ee533dc1cff
GIT binary patch
literal 6148
zcmeHKyG{c!5S)b+k<wgA=`V;xLyL(*LCp_9LW6X0kpe<=*YVjf`vBc>p{0ObX?N`P
zj;)*G)&?M}=etv&0Wha4;!VTUbX|R7N0Ct!+v6S`9<j#~uaoM-3FS7dzr_|$81f&`
zGQY<Qc2{k;-L&1tYJm&l^4-ifT^weAW1X}1Y``*VhEyOGNCi@XRN&t!z@Du(UpQt=
z1yX@j;7bAhKNPxR4eTB5*TJCIcU_+;s&Q;@31W$P4eTAcLKCMFohtFf5T`R=qOJz^
zj!uWz$=oMSmUy9voz8r*a!7T|m<pr<V+D?V+Gzj3r2p{#ACq#H3Zw#mN&%Uzuh%Pn
zQuNlz$7!!E^c(u8vDV5NMwb9iv=yHW>WYq8R|9)Tqcd-GVqOGPm$X#iHx&2)Fvlw>

literal 0
HcmV?d00001

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
new file mode 100644
index 0000000..be1eb94
--- /dev/null
+++ b/.github/workflows/actions.yml
@@ -0,0 +1,15 @@
+name: C++ CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Compile C++ 2017
+        run: g++ main.cpp -std=c++17 -o Bugtastic
diff --git a/main.cpp b/main.cpp
index fcce952..e42f23f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -13,7 +13,7 @@ int main()
   cin>>name;
   cout<<name<< ", what is the first letter of your last name? ";
   cin>>lastInitial;
-  cout<<"Thanks, "<<name<<" "<<lastInitial<<.<<endl;
+  cout<<"Thanks, "<<name<<" "<<lastInitial<<"."<<endl;
   cout<<"Please also tell me how old you are: ";
   cin>>age;
 
@@ -22,8 +22,10 @@ int main()
     cout<<"Hey kid, how do you like school?\n";
   }
   if( age < 18 )
+  {
     cout<<"Cool!"endl;
     cout<<"How's highschool going?\n";
+  }
   else if( age == 18 )
   {
     cout<<"Hey!"<<endl;

From c25ef9a9b2685df6152d8d305e10b14035f41c3c Mon Sep 17 00:00:00 2001
From: Derek Helms <48806608+dhelms1@users.noreply.github.com>
Date: Wed, 16 Feb 2022 11:47:05 -0800
Subject: [PATCH 4/6] Create README.md

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..a1af47e
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# Bugtastic
+
+[![C++ CI](https://github.com/dhelms1/Bugtastic/actions/workflows/actions.yml/badge.svg)](https://github.com/dhelms1/Bugtastic/actions/workflows/actions.yml)

From 707502e0fad451978840c554121e4a879d848b34 Mon Sep 17 00:00:00 2001
From: dhelms1 <derek.helms4@gmail.com>
Date: Wed, 16 Feb 2022 11:48:21 -0800
Subject: [PATCH 5/6] bug fixes, added DS_Store to gitignore

---
 .gitignore | 2 ++
 main.cpp   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 259148f..92c5b58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,5 @@
 *.exe
 *.out
 *.app
+
+.DS_Store
diff --git a/main.cpp b/main.cpp
index e42f23f..ede842d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -23,7 +23,7 @@ int main()
   }
   if( age < 18 )
   {
-    cout<<"Cool!"endl;
+    cout<<"Cool!"<<endl;
     cout<<"How's highschool going?\n";
   }
   else if( age == 18 )

From e66ab715350447bc7df7701dcb0cd5d93c8674ab Mon Sep 17 00:00:00 2001
From: Derek Helms <48806608+dhelms1@users.noreply.github.com>
Date: Wed, 16 Feb 2022 11:49:59 -0800
Subject: [PATCH 6/6] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a1af47e..b417bdc 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
 # Bugtastic
 
-[![C++ CI](https://github.com/dhelms1/Bugtastic/actions/workflows/actions.yml/badge.svg)](https://github.com/dhelms1/Bugtastic/actions/workflows/actions.yml)
+[![C++ CI](https://github.com/dhelms1/Bugtastic/actions/workflows/actions.yml/badge.svg?branch=master&event=push)](https://github.com/dhelms1/Bugtastic/actions/workflows/actions.yml)