Storyboard
Merge remote-tracking branch 'origin/master' into Miemie
Updated Storyboard and ViewController
Merge branch 'Miemie'

Conflicts:
	SmartRecomm.xcodeproj/project.pbxproj