commit to local repository
Merge branch 'master' of https://github.com/jiunjiunma/chef-repo

Conflicts:
	README.md