initial creation
modified gitignore
merged conflict