User Creation: MVC
Resolved merge conflict