Laptop->Computer
Merge remote-tracking branch 'origin/master'
No temp files to repo, also add it to gitignore