Update AppDelegate.m
Update ViewController.h
merged