Merge remote-tracking branch 'upstream/master'
he
changed properties
cursor
Added some assets
"Added Search"
Added Search Bar
Merge branch 'master' of https://github.com/willgu29/DiningApp

Conflicts:
	Bruin
Dining.xcodeproj/project.xcworkspace/xcuserdata/Gu.xcuserdatad/UserInter
faceState.xcuserstate
	Bruin Dining/Base.lproj/Main.storyboard
	Bruin Dining/DiningHoursViewController.m
Merge pull request #4 from willgu29/master

Merge