strings
Merge branch 'master' of
https://github.com/norenma/Projekt-grupp-11-2013.git

Conflicts:
	QuizWalk/res/values/strings.xml