can link LR to both fwks now
Merge branch 'master' of https://github.com/adlnet/xci into setup
fixed cc json parsing in lr search
Merge branch 'convert' of https://github.com/creighton/xci into setup
added update funcs for comps
Merge branch 'master' of https://github.com/adlnet/xci into setup
Merge pull request #20 from ljwolford/setup

Setup