Edit to 'settings' string in values
Merge remote-tracking branch 'master/master'

Conflicts:
	dogeweather/src/main/res/values/strings.xml
Merge remote-tracking branch 'master/master'
Merge remote-tracking branch 'master/master'
Merge remote-tracking branch 'master/master'
Added texts in main.xml.