added gitignore, fixed typo in main
merge conflict with gitignore