Merge branch 'master' of https://github.com/improvingenterprises/GITLabs-CATechnologies

Conflicts:
	handout.md

Author: tej

handout.md

@@ -8,8 +8,52 @@ git commit -m "first commit"
 git remote add origin https://github.com/Tejkarthik/lab2.git
 git push -u origin master
 
+# Git Notes
+This is the Git notes from the 2-day training session at ImprovingEnterprises on Jan 21-22, 2015.
+## Git Overview
+
+## Command Line Cheat Sheet
+Verify Git installation
+```
+git --version
+```
+Get help with Git
+```
+git help
+```
+### Working Locally
+Start git at a folder
+```
+git init
+```
+
+### Working with Remote Repos
+
+## Discussions
 ## Basic Git commands
 
 1. Git Init
 1. Git add .
 3. Git commit -m "lab2"
+# Git Notes
+This is the Git notes from the 2-day training session at ImprovingEnterprises on Jan 21-22, 2015.
+## Git Overview
+
+## Command Line Cheat Sheet
+Verify Git installation
+```
+git --version
+```
+Get help with Git
+```
+git help
+```
+### Working Locally
+Start git at a folder
+```
+git init
+```
+
+### Working with Remote Repos
+
+## Discussions

handout.md.orig

@@ -0,0 +1,40 @@
+<<<<<<< HEAD
+My Notes Here
+Create a new repository
+## COMMANDS TO CREATE A REPOSITORY
+echo # lab2 >> README.md
+git init
+git add README.md
+git commit -m "first commit"
+git remote add origin https://github.com/Tejkarthik/lab2.git
+git push -u origin master
+
+## Basic Git commands
+
+1. Git Init
+1. Git add .
+3. Git commit -m "lab2"
+=======
+# Git Notes
+This is the Git notes from the 2-day training session at ImprovingEnterprises on Jan 21-22, 2015.
+## Git Overview
+
+## Command Line Cheat Sheet
+Verify Git installation
+```
+git --version
+```
+Get help with Git
+```
+git help
+```
+### Working Locally
+Start git at a folder
+```
+git init
+```
+
+### Working with Remote Repos
+
+## Discussions
+>>>>>>> 3c077245a4292b628e37d3ecc9462cab960347c1