change file welcome_controller.rb
add delete function on welcome_controller.rb
add show function for welcome_controller.rb
Merge branch 'test'

Conflicts:
	app/controllers/welcome_controller.rb