friends mode
add friend test
Merge branch 'master' of https://github.com/cuappdev/eatery

Conflicts:
	Eatery/Eatery/FriendsViewController.swift
	Eatery/Eatery/NetworkingViewController.swift
friends list switching
ASDK cellnodes and tableview stuff
Merge branch 'master' of https://github.com/cuappdev/eatery into develop
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
friends table view cell
Changed color and changed location to loc
Merge pull request #19 from yorios9312/master

Changed color and changed location to loc
fix merge
Merge branch 'aelshaer-master'
Changed UI for dining locations search