Finished Quit Options Window
Fixing Merge Conflicts