diff --git a/cheatsheet.md b/cheatsheet.md
index 98fb3eb..3440df3 100644
--- a/cheatsheet.md
+++ b/cheatsheet.md
@@ -1,25 +1,54 @@
 # Git Command Cheat Sheet
 
 ##### Cloning your remote directory
-		git clone <remote directory>
+	        git clone <remote directory>
 
+<<<<<<< HEAD
+##### Checking that status of your local repository
+      		git status
+
+##### Pulling down all branches in a remote repo, not just the default branch
+	        git fetch --all
+
+=======
 ##### Checking that status of your local repository - shows changed but not added files in red
 		git status
 
+>>>>>>> master
 ##### Creating a new branch for you to work on
-		git branch <new branch name>
+        	git branch <new branch name>
 
 ##### See all branches in your remote repository
 		git branch -a
 
 ##### Moving onto a branch
-		git checkout <branch name>
+        	git checkout <branch name>
 
 ##### Deleting a branch
 		git branch -d <branch name>
 
+<<<<<<< HEAD
+##### Moving your changes to the staging area
+        	git add <file name>
+
+##### Committing your changes
+        	git commit -m '<commit message here>'
+
+##### Pushing your commit to the remote repository
+        	git push origin <branch name>
+
+##### Creating a branch and moving onto it.
+        	git checkout -b <new branch name>
+
+##### Merging changes from another branch, to your current branch
+        	git merge <branch you want to merge with your current branch>
+
+##### Pulling remote changes into your local repo
+        	git pull origin <branch name>
+=======
 ##### Moving files while preserving git history
 		git mv <source> <destination>
 
 ##### Creates a branch, and moves you onto it AT THE SAME TIME
 		git checkout -b <new branch name>
+>>>>>>> master
diff --git a/css/stylesheet.css b/css/stylesheet.css
new file mode 100644
index 0000000..e69de29
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..e69de29
diff --git a/js/script.js b/js/script.js
new file mode 100644
index 0000000..e69de29
diff --git a/time/newfile.txt b/time/newfile.txt
new file mode 100644
index 0000000..08b9297
--- /dev/null
+++ b/time/newfile.txt
@@ -0,0 +1 @@
+Hey its my 3 time!
\ No newline at end of file