adding jackson
resolved conflicts
resolved conflicts.
changing gitignore