formatting
get basic search working
Merge branch 'master' into search

Conflicts:
	app/controllers/pages_controller.rb
	app/views/application/_video_grid_container.html.erb
add functional sorting
implement cache columns for sorting
Merge branch 'master' into search

Conflicts:
	app/models/video.rb
Merge pull request #43 from lukesteensen/search

search