Changes to .gitignore required to be committed in order to continue merge
Changes to .gitignore required to be committed in order to continue merge

caracolrec/caracol,caracolrec/caracol,caracolrec/caracol