Test 1

Just a test to see if I understand how to use this newfangled git.
Revert "Test 1"

This reverts commit c33e2a4099a255950d56609dde179114abc1ab1e.
Revert "Revert "Test 1""

This reverts commit d6da2e681c5557bbef26776e3fac4dd995724661.
Merge pull request #1 from CS-196-Space-Colonization/economics

Economics