storyboard updates
Merge branch 'master' of https://github.com/qclmnt/cheese

Conflicts:
	Cheese/Cheese.xcodeproj/project.pbxproj
	Cheese/Cheese.xcodeproj/project.xcworkspace/xcshareddata/Cheese.xccheckout
	Cheese/Cheese/ViewController.swift