add a button Button
change segue
Merge branch 'master' of github.com:ionutivan/StoryboardSample

Conflicts:
	StoryboardMerge/Base.lproj/Main.storyboard