First Commit
Corrected .gitignore confcts