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

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

Conflicts:
	app/models/video.rb
basic layout for dashboard review
Merge branch 'master' into dashboard-pages
Merge pull request #70 from zsherman/dashboard-pages

Dashboard pages
Merge pull request #43 from lukesteensen/search

search