scm-ninja · gagarin525125 · May 22, 2019 · May 22, 2019 · May 22, 2019 · May 22, 2019
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
 _site/
 .sass-cache/
 .jekyll-metadata
+LICENCE
+log/
+*.orig
diff --git a/.ignore b/.ignore
diff --git a/README.md b/README.md
@@ -1,2 +1,33 @@
-# scm-ninja.github.io
-Trying out Pages
+changed to new branch
+
+modification 1
+modifieng file
+
+# STARTER WEB PROJECT
+second modification
+
+## iNTRODUCTION
+another modification
+
+### deployment
+
+
+#### four pounds
+
+###### pounds
+
+
+######   
+          six pounds
+
+#######
+		  sevenths
+
+### Copyright
+Copyright notice
+
+### How to Continue
+fork 
+
+## Add a line for rebase
+add a line  for rebase example All rights reserved
diff --git a/humans.txt b/humans.txt
@@ -0,0 +1,2 @@
+change 2
+change 1
diff --git a/index.html b/index.html
@@ -2,7 +2,7 @@
 <html lang="en-us">
   <head>
     <meta charset="UTF-8">
-    <title>Scm-ninja.GitHub.io by scm-ninja</title>
+    <title>Tagging example</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" type="text/css" href="stylesheets/normalize.css" media="screen">
     <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>

diff --git a/params.json b/params.json
@@ -3,4 +3,11 @@
   "tagline": "Trying out Pages",
   "body": "# scm-ninja.github.io\r\nTrying out Pages\r\n",
   "note": "Don't delete this file! It's used internally to help with page regeneration."
-}
+}
+Jason Tailer
+company name
+dummy text
+changing title
+
+
+all my students
diff --git a/simple.html b/simple.html
@@ -0,0 +1,15 @@
+Change 5
+Change 4
+Change 1
+change 2
+add copyright
+next change
+modification before rebase
+next change from bigtrouble
+<<<<<<< HEAD
+
+
+&copy; 2019 Git.Training
+=======
+change from web
+>>>>>>> ca57e02084ff9049f769919ef0804a42d8016990