test
Merge branch 'master' of https://github.com/ryanscottmalmoe/MR

Conflicts:
	MR/AppDelegate.m
	MR/main.storyboard