Merge pull request #2 from bizarrohilary/master

an example assignment commit for our group repo
adding mac files to the gitignore file