nhiem's
Merge branch 'master' of https://github.com/YourdonJou/Friend-Quiz-II

Conflicts:
	Friend Quiz.xcodeproj/project.pbxproj
	Friend
Quiz.xcodeproj/project.xcworkspace/xcuserdata/nhiemtruong.xcuserdatad/Us
erInterfaceState.xcuserstate