merge
Merge branch 'master' of git@github.com:ichylinux/medic.git

Conflicts:
	app/controllers/welcome_controller.rb
	app/views/welcome/index.html.erb