Made some decisions
Using uid instead of user.id as unique identifier for user
Added profile pictures
Merge branch 'profile_pics'
Merge