Mixed merge issue.  Starting to work on getting a good build.
Merge branch 'master' into FollowerViewController
storyboard thing