initial commit
gitignore conflict fixed