updated view and controller files
Update model
Merge branch 'view_controller2' of https://github.com/rjmccluskey/battle_of_the_jokes