trying to get category logic in place
trying to fix merge
added styling to front end
added styling for results page
adjusted styling for results page
commiting
optimizing search querying, please rake db:migrate, also added resources for categories and categories controller
trying to merge
funky merge
fixed weird merge