merge Gemfile
Merge branch 'master' of https://github.com/buta9999/myservers
Merge branch 'master' of https://github.com/buta9999/myservers

Conflicts:
	Gemfile
merge branch
Merge branch 'master' of https://github.com/buta9999/myservers
add chef-docker