local changes
Merge branch 'master' of https://github.com/trvd1707/OMGHelp

Conflicts:
	IDialJesus_iPad.storyboard
	iDialJesus_iPhone.storyboard
local changes
Merge remote-tracking branch 'origin/master'
fixing iPad storyboard
Merge remote-tracking branch 'origin/master'
fixed iPhone storyboard