Revert "Merge by hand"

This reverts commit 0ec2c4a775bef277be02c14756e214a05ac31ed5.
Revert "Moved conflicting code"

This reverts commit ec6f130bb8ba3bb8b32a5667ef23847dddd53c10.
Revert "Remove to options.txt file"

This reverts commit 3dee3135d7d9c911712fdc48cbe84524004b1c10.
Revert "Ran Formatter and Organized Imports"

This reverts commit d87335557cb31747c1d8da7d7f532374a19c3b5a.
Revert "Updated .gitignore"

This reverts commit b290a145e64d4ec52cd8ce1fcfc65ea5bbaa0a43.
Revert "Initall 1.7.10 Commit"

This reverts commit 722600ecf930be1a99f3695f8fe09d9c240e90c2.