openrocket/openrocket — pull request #188 by CarVac (2014-03-18 17:59:02+00:00)
Title: Added two new thrust curves

Some of the merging went weird. Please resolve these properly.

Additionally, why are the binary datafiles still tracked? Should that be changed in the gitignore?