Commit 1

A
Merge branch 'Michael' into RyansBranch
test
Merge branch 'RyansBranch' into Michael
test
asdf
Merge
Merge branch 'master' into Michael

Conflicts:
	MR/LocationViewController.m
UI Major Update
asdf
Merge branch 'Michael'

Conflicts:

MR.xcodeproj/project.xcworkspace/xcuserdata/michael.xcuserdatad/UserInte
rfaceState.xcuserstate
Merge branch 'master' of https://github.com/ryanscottmalmoe/MR

Conflicts:

MR.xcodeproj/project.xcworkspace/xcuserdata/michael.xcuserdatad/UserInte
rfaceState.xcuserstate
Merge branch 'master' of https://github.com/ryanscottmalmoe/MR