taking out the other gitignore and adding in these files