Storyboard 2.1
Storyboard Unmodified
Merge branch 'master' into Storyboard

Conflicts:
	SmartRecomm.xcodeproj/project.pbxproj
	SmartRecomm/RestaurantList.plist
	SmartRecomm/SmartRecomm.storyboard
	SmartRecomm/mainViewController.m
Storyboard 2.0
Merge branch 'storyboard2' of https://github.com/usc-588/application-smart-recommendation into storyboard2

Conflicts:
	SmartRecomm/SmartRecomm.storyboard
Merge branch 'master' of https://github.com/usc-588/application-smart-recommendation