Change ViewController and Main.storyboard
Merge pull request #1 from nicopasso/master

Some changes in ViewController.swift and Main.storyboard