Added index view and controller
Manual merge