user profile image to nav bar
Merge branch 'danielle'
Merge branch 'master' of github.com:daniellecs/project_craig
fixed minor search bug before experimenting with elasticsearch
more changes
Merge branch 'master' of github.com:daniellecs/project_craig
fixed merge conflicts
user show page styling
Merge branch 'master' of github.com:daniellecs/project_craig into danielle
changes