Initial creation
merged conflict in .gitignore