Added .DS_Store to .gitignore (MACOS sys file)
Merge branch 'master' of github.com:jposton2/cs326