Added SortByTableView to Eat Now
Added Search/Filter Function for Dining Halls
Merge branch 'master' of https://github.com/aelshaer/eatery-1

Conflicts:
	Eatery/Eatery.xcodeproj/project.pbxproj
	Eatery/Eatery/EatNowTableViewController.swift
	Eatery/Eatery/SortByTableViewController.swift
Revert c1fabfc..f5f439d

This rolls back to commit c1fabfcf0050cf1b11ee590fbc41b9b59b20054f.
Sort changes
fix merge
Added search function to dining hall data
fix merge
Merge branch 'aelshaer-master'