Update strings.xml. B.
Merge branch 'master' of https://github.com/cattaka/LearnGit

Conflicts:
	app/src/main/res/values/strings.xml