Test
Merge remote-tracking branch 'origin/master' into master2
Merge remote-tracking branch 'origin/master' into master2
Storyboard update 3.0
Merge branch 'miemie3' of https://github.com/usc-588/application-smart-recommendation into miemie3

Conflicts:
	SmartRecomm/SmartRecomm.storyboard