First commit.
Fixed commit issues I hope oh god.
Merge remote-tracking branch 'origin/master'
Changed name of VC in storyboard to BeaconActiveViewController.