first commit
merged conflict on gitignore