edited git confirm
Merge branch 'master' of https://github.com/cristy95/ATRrepo

"to merge the edited files"