Merge pull request #164 from jasonMatney/jason

clipped the movie
Fixed CSS for user home page and fixed favorites button so user homepage displays favorites, also fixed image display on descriptions page to center single image
Fixed merge conflict with centering single image
Merge pull request #165 from JessicaTatham/master

Fixed CSS for user home page and fixed favorites button so user homep…
made sorting by continget work right, and updated filters
fixed merge conflicts
Description page is mobile responsive
Merge pull request #166 from LasseSviland/master

made sorting by continget work right, and updated filters
Merge branch 'master' of https://github.com/cicadas-2014/Embark
work on description page
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
Fixed merge conflict and fixed spacing on user page
Merge pull request #167 from JessicaTatham/master

Description page is mobile responsive
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
making some titles mobile responsive and getting rid of video for mobile responsiveness
Merge pull request #168 from JessicaTatham/master

making some titles mobile responsive and getting rid of video for mobile...
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
updated images to work on heroku
updated css for login/signup form to be hidden by default
Merge pull request #169 from LasseSviland/master

updated images to work on heroku