initial commit
resolved .gitignore conflict