stashing
fixing conflict
merging
added return filename option to file_to_txt and updated docs