added rest of files
Merge remote-tracking branch 'origin/master' into jackson
started to fix crossover
Merge pull request #6 from bjacobel/jackson

Jackson