Merge pull request #2 from willgu29/master

Added spinner and isVegan/isVege and links
more UI tweaks to menu
renamed anotherNode variable, fixed link
Hour parsing, UI updates
branch switching
branch switching 2
merge test
Merge branch 'master' into willgu29-master
"test merge"
fixed merge error
hours changes
Added favorites vc, improved hours parsing
changed meal types to enum, added switching between meals
"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