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
Merge pull request #58 from ngoel36/comments

delete parent comment if parent comment is also deleted
deleted comments are no longer removed from db
Merge pull request #59 from ngoel36/fix_delete

deleted comments are no longer removed from db
add rating to seeds
Merge pull request #60 from ngoel36/rating_seed

add rating to seeds
cleaned up deleting comments code
Merge pull request #61 from ngoel36/delete_comments

cleaned up deleting comments code
fixing some styling
Merge branch 'master' into video-player