added new view controller
Merge
Fixing merge messup