added 3rd view controller
Merge remote-tracking branch 'origin'