test
Merge branch 'master' of https://github.com/Robert048/RunForAll

Conflicts:
	res/values/strings.xml