Changing milliseconds to seconds on settings label
Merge branch 'updating_settings_label'