Added SettingsActivity and GraphActivity
Added SettingsActivity and GraphActivity
Merged