pullin now
Edited the .gitignore file.
Corrected merge conflicts.