commit
Merge branch 'master' of https://github.com/miya-masa/chef-repo

Conflicts:
	Vagrantfile