resolved merge conflicts
Added partials for search form
Changed link_title method for activities without datecommit message for your changes. Lines starting
Updated controller to display all categories in the search eengine
Commented the sorting for now. Advance sorting later today
Corrected typos and added partials in the views
Corrected missing end in helper
modified:   app/helpers/activities_helper.rb
modified:   app/helpers/search_helper.rb
Merge branch 'search' of https://github.com/thomasstephane/randompractice

Conflicts:
	app/helpers/activities_helper.rb
	app/helpers/search_helper.rb
Fixed weekend calculation formula to take into account if today is a weekend
modified:   app/controllers/activities_controller.rb
modified:   app/helpers/activities_helper.rb
modified:   app/helpers/time_helper.rb
modified:   app/views/activities/index.html.erb
Added weekend and today methods, rfactored activity model
modified:   app/helpers/time_helper.rb
modified:   app/models/activity.rb
deleted:    app/views/activities/shit.html.erb
Removed buggy gem better-errors