Merge branch 'master' of https://github.com/priyamathew/raplaughs
Add Laugh controller
Remove default Rails index
Add Laugh index page
Add Laugh route, root route
Merge branch 'master' into set_up_homepage
Resolve merge conflict