initial commit
fixed gitignore merge conflict