Added Test.txt
Removed test.txt
Change latex example
Changed latex columns
Merge conflict in latexexample fixed
space
rm line
twolines
merge fix
Added information on merging particular branches with remotes branches
Merge remote-tracking branch 'origin/master'
Explain that you must do a fetch after adding a remote in order to access its branches.
Add anoter useful git command to the list in readme.
Add selective file merge command to readme.
Merge remote-tracking branch 'cgrandin/master'