Create static controller and welcome page
Resolve merge conflict in user.new view