Merge branch 'master' of https://github.com/jterschluesen/FDR2soilmoi… …sture - edited conflicts in inst/example/sensor_calibration.txt, changed date format - updated DESCRIPTION
Merge branch 'master' of https://github.com/jterschluesen/FDR2soilmoi… …sture - edited conflicts in inst/example/sensor_calibration.txt, changed date format - updated DESCRIPTION