From 1d8494d4781d9d8f36485e3e9766a4195dcad00e Mon Sep 17 00:00:00 2001
From: Meher Lippmann <melippmann@mail.csuchico.edu>
Date: Mon, 21 Feb 2022 11:20:05 -0800
Subject: [PATCH] Added CI checks to make sure that the build process works
 without failure every time a new commit is made to main and added a status
 badge to README.md so that we can see how the CI is performing from the repos
 homepage resolves #1

---
 Makefile  | 7 -------
 README.md | 6 +++++-
 main.cpp  | 4 ++--
 3 files changed, 7 insertions(+), 10 deletions(-)
 delete mode 100644 Makefile

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 91855bf..0000000
--- a/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-.PHONY: clean
-
-all:
-	g++ -std=c++11 -Wfatal-errors main.cpp dictionary.cpp -o wordler
-
-clean:
-	rm -rf *.o wordler
\ No newline at end of file
diff --git a/README.md b/README.md
index 019524f..4cdf499 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 [![C/C++ CI](https://github.com/melippmann/Wordler/actions/workflows/c-cpp.yml/badge.svg)](https://github.com/melippmann/Wordler/actions/workflows/c-cpp.yml)
 # Wordler
 
@@ -17,4 +18,7 @@ Then play the game:
 ./wordler
 ```
 
-The game will randomly-select a 5-letter word and you have unlimited guesses to get the word right. Each time you guess, if you have a letter that matches the same location as it is in the secret word, it will be revealed to you. However, any letter that does *not* match the secret word's letter at the same location will be displayed as `_`. Good luck!
\ No newline at end of file
+The game will randomly-select a 5-letter word and you have unlimited guesses to get the word right. Each time you guess, if you have a letter that matches the same location as it is in the secret word, it will be revealed to you. However, any letter that does *not* match the secret word's letter at the same location will be displayed as `_`. Good luck!
+=======
+# Wordler
+>>>>>>> parent of 3c4d001... Remove answer reveal and document build:
diff --git a/main.cpp b/main.cpp
index 3d81b0a..48365c0 100644
--- a/main.cpp
+++ b/main.cpp
@@ -17,7 +17,7 @@ int main(){
     int guesses = 0;
 
     secret = word_list.select_word();
-    // REVEAL ANSWER: std::cout << secret << std::endl;
+    std::cout << secret << std::endl;
     std::cout << "Welcome to Wordler -- a game that totally isn't simplified Wordle\n";
     std::cout << "Guess your five-letter word:\n_____\n";
     
@@ -37,7 +37,7 @@ int main(){
             std::cout << "Congrats, you got it in " << guesses << " guesses!\n";
         }
         else{
-            std::cout << hint << " Guess again: ";
+            std::cout << hint << std::endl << "Guess again: ";
         }
     }while( hint != secret );