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
twolines
merge fix
Merge remote-tracking branch 'cgrandin/master'