abc
Merge branch 'master' of https://github.com/JiCaiCai/KeepingRunning

Conflicts:
	KeepingRunning/res/values/strings.xml
test record