Added some stuff to a view controller
Merge remote-tracking branch 'origin/master'
Made some changes to the main storyboard.