updated
Merge branch 'master' of github.com:syunkitada/chef-repo-test

Conflicts:
	fabfile/README.md