Changes to strings.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Team07RecipeFinder/res/values/strings.xml
Merge branch 'master' of ssh://git@github.com/Torboto/cmput301W13T07.git