redo user
fix crash
observation
User refactor into User2.swift
Merge branch 'develop' of https://github.com/cuappdev/eatery

Conflicts:
	Eatery/Eatery/FriendsViewController.swift
	Eatery/Eatery/User.swift
user stuff
groupme stuff
friends list bugfix
Merge branch 'develop' of https://github.com/cuappdev/eatery

Conflicts:
	Eatery/Eatery/User.swift
friend requests
pull from master
Merge branch 'develop' of https://github.com/cuappdev/eatery into develop
Merge pull request #22 from cuappdev/develop

Develop