added gitignore
initial import
merge conflicts