my commit before merge
my commites
merging
Fixed iPad storyboard
fixed ipad stuff