update alamofire
sorted friends list w/ priminary group view
Merge branch 'master' of https://github.com/cuappdev/eatery

Conflicts:
	Eatery/Eatery.xcodeproj/project.pbxproj
better sign in
ignore ds_store
Add model stubs
Merge pull request #1 from lucasderraugh/master

Add model stubs
Merge branch 'master' of https://github.com/cuappdev/eatery

Conflicts:
	Eatery/Eatery.xcodeproj/project.pbxproj
Merge pull request #2 from alexzielenski/master

friends view
Merge branch 'master' of https://github.com/cuappdev/eatery into develop