removed an orig file
uploading new finished background artwork and deleted unnecessary image files
Merge branch 'master' into martina
test application.css
test application.css part 2
updated libs
updating videos controller
updating videos controller
final background image
merged application css with Sarah's changes
fixed route
fixing merge conflict
removed a merge file
style and tests
style and tests