initial commit
Merge branch 'master' of github.com:ichiyama/chef-repo

Conflicts:
	README.md
Merge branch 'master' of github.com:ichiyama/chef-repo

testing