update profile
add uploader
landing page css
resolving conflicts
refactor model code and add favorites table
resolving conflicts