Add association for Jokes and User Comments
Comment on show page working
Updates Views
Merge Conflict Fixes