added user model
Added users -- to an extent
resolved conflicts from pull
Fully function user and connected User to Eatery Through Favorites
merging jeremy and angela
successfully merged