removed merge .orig files
Update .gitignore
Merge branch 'master' into assignment4