test application.css
test application.css part 2
updated libs
updating videos controller
updating videos controller
merged application css with Sarah's changes
fixed route
fixing merge conflict