adding tex and org-mode versions
other updates
adding magit
resolve conflict ?