Initial creation
merge conflict in .gitignore