Testing gitignore
More .gi testing
Fixing merge isssues