Added ability to merge in json test results
Merge pull request #1 from insurancezebra/master

Added ability to merge in json test results