Routes defined, new controller added, views added.
Resolved merge conflict