Rita Changs
Merge branch 'master' of https://github.com/vivianaranha/Someotherbook

Conflicts:
	SomeOtherBook/SomeOtherBook.xcodeproj/project.pbxproj

SomeOtherBook/SomeOtherBook.xcodeproj/project.xcworkspace/xcuserdata/rem
otetiger.xcuserdatad/UserInterfaceState.xcuserstate