Updated git tutorial
Conflicts resolved and new file added