commit
add string
Merge branch 'master' of git@github.com:StevenKo/novel_reader.git

Conflicts:
	res/values-zh/strings.xml
	res/values/strings.xml
setTextColor function