diff --git a/.gitignore b/.gitignore
index 5c91b60..24cc36d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
_site/
.sass-cache/
.jekyll-metadata
+LICENCE
+log/
+*.orig
\ No newline at end of file
diff --git a/.ignore b/.ignore
new file mode 100644
index 0000000..e69de29
diff --git a/README.md b/README.md
index 03ff269..aed7bf1 100644
--- 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
new file mode 100644
index 0000000..ff31bd0
--- /dev/null
+++ b/humans.txt
@@ -0,0 +1,2 @@
+change 2
+change 1
\ No newline at end of file
diff --git a/index.html b/index.html
index 9ea9c85..4475df3 100644
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
- Scm-ninja.GitHub.io by scm-ninja
+ Tagging example
diff --git a/params.json b/params.json
index 39569dd..c54899f 100644
--- 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."
-}
\ No newline at end of file
+}
+Jason Tailer
+company name
+dummy text
+changing title
+
+
+all my students
\ No newline at end of file
diff --git a/simple.html b/simple.html
new file mode 100644
index 0000000..eaf5099
--- /dev/null
+++ 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
+
+
+© 2019 Git.Training
+=======
+change from web
+>>>>>>> ca57e02084ff9049f769919ef0804a42d8016990