Add secondary text for a test
Added Primary text
Merge branch 'master' of github.com:cgrandin/git-workshop

Conflicts:
	getOutput.r
Change latex title text
Change latex title text from secondary repo
Merge remote-tracking branch 'origin/master'

Conflicts:
	latexExample.tex
echo on in clean.bat
echo off removed from clean.bat
Merge conflict resolved for echo off/clean.bat
Change readme for command to do soft commit undos
Add git mergetool to useful commands in readme
Add presentation powerpoint
Added Hello to Readme
Added Test.txt
Removed test.txt
Change latex example
Changed latex columns
Merge conflict in latexexample fixed
space
rm line