init commit
gitignore conflict resolved