model controller and routes created
2nd changes
Create Joke to User Assocaition
Add User to Comment Association
Add association for vote with joke and user - Add Like buttons on video show
Add category model & controller
fix merge conflict for category addition
Fix merge on Joke Show Page
Style Joke show page, Add Joke description & youtube to table
Made otption for youtube video as new joke and render video thumbnail image
Place Youtube image thumbnails in recommended side panel
Style index page - Float thumbnail images left
updating json branch
updating json branch again
making  links work in nav bar
fixing application.css navbar style
fixing application.html.erb
styling login
styled index of jokes page, still need image link to work
styling signup page, login page