initial commit
fixed the .gitignore conflict