3,madigan6: attempting to fix merge issues
Merge branch 'master' of https://github.com/rafaelangelucci/WorkoutBuddy
3,madigan6: fixing strings.xml that was messed up and missing strings causing project to be broken