scm-ninja · rnunez-ws · Sep 21, 2023 · Sep 21, 2023 · Sep 21, 2023 · Sep 22, 2023
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,5 @@
+.DS_Store
+*.xlsx
+*.log
+log/
+*.orig
diff --git a/README.md b/README.md
@@ -1,7 +1,32 @@
-# Starter Web Repo
+# Starter Web Project
 
-This repository is for showing how Git and GitHub work
+Edit form feature branch to view diff
+
+C2 Edit form feature branch to view diff
+
+
+This is a simple website project for showing how to use Git and Github together.
+Emergency fix
+
+C1 en master
+C2 en myfeature
+
+## Introduction
+This is an example to show different parts of the Git repository and various commands using a ewb project.
 
 ## Purpose
 
-Sample website with plenty of files for demos
+As stated above, the main purpose is to provide simple examples for Git training demos.
+
+## Deployment
+
+This a simple web project, deployment can be on any web server or even local file system.
+
+## How To Contribute
+
+Pleasy fork this repository
+
+### Copyright
+
+2014 Git.Training. 2
+C1 master after stash
diff --git a/humans.txt b/humans.txt
@@ -3,13 +3,14 @@
 
 # TEAM
 
-    <name> -- <role> -- <twitter>
+  Json Tylor
 
 # THANKS
 
-    <name>
+    Please leave a review
 
 # TECHNOLOGY COLOPHON
 
     HTML5, CSS3
     jQuery, Modernizr
+    Stash branch ej en file humans
diff --git a/index.html b/index.html
@@ -6,7 +6,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <title></title>
+        <title>Tagging example</title>
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
@@ -45,7 +45,7 @@
             <div class="form-group">
               <input type="password" placeholder="Password" class="form-control">
             </div>
-            <button type="submit" class="btn btn-success">Sign in</button>
+            <button type="submit" class="btn btn-success">Login in</button>
           </form>
         </div><!--/.navbar-collapse -->
       </div>

diff --git a/simple.html b/simple.html
@@ -1,6 +1,9 @@
 <!DOCTYPE html>
+<!--
+	Copyright 2014 Git.Training 2
+-->
 <head>
-	<title></title>
+	<title>Update for tagging compare example</title>
 	<link rel="stylesheet" href="css/bootstrap.min.css">
 	<style>
 		body {
@@ -14,11 +17,11 @@
 	<main class="container">
 	<!-- Content Goes Here -->
 		<p>
-			Just some content
+			Adding content after "git stash" y "git stash apply" 
 		</p>
 	</main>
 	<footer class="container">
-		<p>&copy; Company 2014</p>
+		<p>&copy; C1 Master pull with rebase Git Training 2014 now 2023</p>
 	</footer>
 </body>
 </html>