ruby
merge
Merge branch 'master' of https://github.com/gaspaio/ansible-devbox

Conflicts:
	roles/ruby/tasks/main.yml