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

Conflicts:
	Gemfile.lock
bundle update