Added *~ ignore to gitignore
Merge branch 'assignment2'