init
Merge branch 'master' of https://github.com/wkodate/chefVagrant

Conflicts:
	.gitignore