Merge pull request #92 from incrediblesound/master

fix user serialization
display art correctly
some user stuff
change site name and description on main page
Merge pull request #93 from eave/master

display art correctly
fix homepage route
Add style for search-results page
Add style for search-results page
Merge branch 'master' of https://github.com/aconnelly/project
change 'Cat' to 'User', fix like functionality
Merge pull request #94 from eave/master

change 'Cat' to 'User', fix like functionality
Merge branch 'master' of https://github.com/DangerousWrench/project
some user stuff
fix homepage route
more user stuff
Search-results styling
Add style for search-results page
Search-results styling
Merge branch 'master' of https://github.com/aconnelly/project
Merge pull request #95 from aconnelly/master

(Styling) Update correct search-results styling