strings
Merge branch 'master' of https://github.com/psperber/codecamp2

Conflicts:
	Challenger/res/values/strings.xml