Minor changes in linux_terminal_cheat_sheet.txt.
Merge branch 'master' of https://github.com/mb720/docs
Added 'Conflict Merging' to git_cheat_sheet_txt