Homepage is now rendering video
fixed merge conflicts
Merge pull request #27 from alexung/alex_css_homepage

Homepage is now rendering video