changed css
fixed merge conflicts
fixed errors
fixed errors
fixed errors
fixed merge conflicts
added scroll and movies
added infinite scroll
added scroll buttons
created carousel
fixed carousel arrows
changed menu to account
fixed scroll funciton in movies template
added changes
fix some conflicts
fix conflicts, add css from samantha branch
ds store
Finished controller and model tests
fix conflicts for html/css
got rid of pending tests