changed the string text for some activities
Merge branch 'forum' of https://github.com/tina-wang365/UCRCS180Project into forum