Storyboard setup
resolved conflicts
resolved conflicts
more git stuff