Merge branch 'master', remote-tracking branch 'origin'
Merge branch 'master', remote-tracking branch 'origin'
Added turbine friction to the individual turbine information .csv output. Updated documentation.
Merge remote-tracking branch 'origin/master'