Merge branch 'master' of https://github.com/pcbend/GRSISort
Merge branch 'master' of https://github.com/pcbend/GRSISort
Merge branch 'master' of https://github.com/r3dunlop/GRSISort
Merge branch 'master' of https://github.com/pcbend/GRSISort
Added timediffspec to html generator
Can now read calibration files off command line
Merge pull request #160 from r3dunlop/master

Can now read cal files on command line.