changed naming
merged dev
modified calculation of lift rate
reconstructed rift-rate calculation