merge laptop
merging + .gitignore
merge
adding untracked files