Updated import from week1 and added gitignore
merge