initial commit
merged code conflict in gitignore