removed the error from string.xml
Merge branch 'master' of https://github.com/erikduvet/GitWarriors.git