formatting
get basic search working
markdown and syntax highlighting now works....kind of. CSS is all fucked up.
Merge branch 'master' into search

Conflicts:
	app/controllers/pages_controller.rb
	app/views/application/_video_grid_container.html.erb
updating player attributes for analytics dashboard
Merge pull request #66 from zsherman/video-player

updating player attributes for analytics dashboard
added video card mixin and styled 'my videos' and 'bookmarks' pages on dashboard
Merge pull request #67 from zsherman/dashboard-pages

Video card mixin and 'my videos' and 'bookmarks' pages on dashboard
viewed vidoes dashboard page
public s3 urls are now generated
Merge pull request #68 from maxgillett/upload_form

public s3 urls are now generated
add functional sorting
styling reviews
markdown rendering and code syntax highlighting. css restructuring so that Reset doesn't happen 20 times. css fix to make basic elements work on markdown rendering.
Merge pull request #64 from ngoel36/notes

markdown and syntax highlighting now works....kind of. CSS is all fucked up.
fix a big bug where i never actually limited the css classes to markdown...
Merge pull request #69 from ngoel36/markdown_fix

fix a big bug where i never actually limited the css classes to markdown...
implement cache columns for sorting
Merge branch 'master' into search

Conflicts:
	app/models/video.rb
basic layout for dashboard review