redo user
fix crash
observation
Merge branch 'develop' of https://github.com/cuappdev/eatery

Conflicts:
	Eatery/Eatery/FriendsViewController.swift
	Eatery/Eatery/User.swift