Updated .gitignore rules
Initial commit for assignment 4
Trying to resolve conflicts with .DS_Store