Ben

Creation of controllers and fixed merge conflict in routes file