first commit
added gitignore
fixed conflict