Please god work
Merge branch 'master' of https://github.com/ryanscottmalmoe/MR

Conflicts:
	MR/LocationViewController.m