Merge remote-tracking branch 'origin/sagar' into Brian_new_branch

Conflicts:
Ping/Main.storyboard
Ping/ViewController.swift