Created welcome controller with index action
added welcome index to routes
fixed merge conflicts