Carol added *.iml to gitignore.
Carol & Dannielle: merged .gitignore