Trying to copy all the files with -A, not sure if the search goes deep
Merge remote-tracking branch 'upstream/master'