Added mac .DS_Store files to .gitignore.
Added files containing #, which are usually swap or backup files, to .gitignore.
Merge branch 'master' of github.com:fsecilia/mmc