adsdasdddas
Merge branch 'master' of github.com:successpatterns/sample-jenkins-app

Conflicts:
	test/controllers/welcome_controller_test.rb