hopefully adds all files to master