Innitial creation
merged conflict in .gitignore