committing small changes to catch curve 2
This program merges with Daniel Knip's program and starts looking into programming catch curve 2
Merge branch 'master' of https://github.com/AaronGreenberg/ELEFAN
Pulling Danielle's most recent changes Merge branch 'master' of https://github.com/AaronGreenberg/ELEFAN
committing small fix to Main Gui