upload page styling
gem integration
added .rvmrc to gitignore
upload page functionality
abstracted video html into partial under /application
Merge pull request #52 from zsherman/video-card

abstracted video html into partial under /application
uploaded videos are now transcoded by zencoder
zencoder notifications. see pull request for details
fixing merge conflicts
Merge pull request #53 from maxgillett/master

Multipart gem integration
fixed progress bar style conflicts + made upload form operational
Merge pull request #54 from maxgillett/fixing_upload_form

fixed progress bar style conflicts + made upload form operational
tons of styling
done with reviews and comments
merge max's changes
bug fixes
Merge pull request #56 from ngoel36/watch_page

bug fixes
hash
Merge pull request #57 from ngoel36/hash

hash
delete parent comment if parent comment is also deleted