Added SortByTableView to Eat Now
friends mode
add friend test
Merge branch 'master' of https://github.com/cuappdev/eatery

Conflicts:
	Eatery/Eatery/FriendsViewController.swift
	Eatery/Eatery/NetworkingViewController.swift
updated alamofire
friends list switching
ASDK cellnodes and tableview stuff
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.
updated constants to better formatting in detail pages, no longer dependent on xib files
Merge pull request #18 from Dfedor/master

updated constants to better formatting in detail pages, no longer depend...
Merge branch 'master' of https://github.com/cuappdev/eatery into develop
fix merge
Merge branch 'develop' of https://github.com/cuappdev/eatery
Merge branch 'master' of https://github.com/cuappdev/eatery

Conflicts:
	Eatery/Eatery.xcodeproj/project.pbxproj
latest
fix error
Merge branch 'develop' of https://github.com/cuappdev/eatery

Conflicts:
	Eatery/Eatery/User.swift
Sort changes