change4
change5
nslog
nslog
change
nothing
ryansCommit1
k
Merge branch 'RyansFinalBranch' into New-Master2

Conflicts:
	MR.xcodeproj/project.pbxproj

MR.xcodeproj/project.xcworkspace/xcuserdata/ryanmalmoe.xcuserdatad/UserI
nterfaceState.xcuserstate
	MR/Account.h
	MR/Account.m
	MR/AppDelegate.h
	MR/LocationViewController.m