some user stuff
fix homepage route
some user stuff
fix homepage route
more user stuff
Merge pull request #95 from aconnelly/master

(Styling) Update correct search-results styling
user
conflict
Merge pull request #96 from lpappone/master

userpagw
Change 'Logo'
Merge branch 'master' of https://github.com/aconnelly/project